[Zope-Checkins] SVN: Zope/trunk/ Removed deprecated ``read-only-database`` option from zope.conf.

[Hanno Schlichting]

Log message for revision 110467:
  Removed deprecated ``read-only-database`` option from zope.conf.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Zope2/Startup/handlers.py
  U   Zope/trunk/src/Zope2/Startup/zopeschema.xml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2010-04-03 18:16:04 UTC (rev 110466)
+++ Zope/trunk/doc/CHANGES.rst	2010-04-03 18:18:27 UTC (rev 110467)
@@ -11,6 +11,8 @@
 Restructuring
 +++++++++++++
 
+- Removed deprecated ``read-only-database`` option from zope.conf.
+
 - Updated copyright and license information to conform with repository policy.
 
 - Moved the ``absoluteurl`` views into the OFS package.

Modified: Zope/trunk/src/Zope2/Startup/handlers.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/handlers.py	2010-04-03 18:16:04 UTC (rev 110466)
+++ Zope/trunk/src/Zope2/Startup/handlers.py	2010-04-03 18:18:27 UTC (rev 110467)
@@ -69,17 +69,6 @@
     value and _setenv('ZOPE_DATABASE_QUOTA', value)
     return value
 
-def read_only_database(value):
-    # This handler exists only for BBB:  using the 'read-only-database'
-    # directive in a config file is deprecated.
-    if value is not None:
-        import warnings
-        warnings.warn("The 'read-only-database' configuration option is "
-                    "deprecated; please use the correct optoin inside the "
-                    "section defining the appropriate storage.",
-                    DeprecationWarning, stacklevel=2)
-    return value
-
 def structured_text_header_level(value):
     value is not None and _setenv('STX_DEFAULT_LEVEL', value)
     return value

Modified: Zope/trunk/src/Zope2/Startup/zopeschema.xml
===================================================================
--- Zope/trunk/src/Zope2/Startup/zopeschema.xml	2010-04-03 18:16:04 UTC (rev 110466)
+++ Zope/trunk/src/Zope2/Startup/zopeschema.xml	2010-04-03 18:18:27 UTC (rev 110467)
@@ -784,16 +784,6 @@
      <metadefault>unset</metadefault>
   </key>
 
-  <key name="read-only-database" datatype="boolean"
-       handler="read_only_database">
-     <description>
-      Deprecated option, no longer has any effect.  To configure opening
-      storages in read-only mode:  please use the appropriate flag in the
-      section which configures each storage.
-     </description>
-     <metadefault>off</metadefault>
-  </key>
-
   <section type="eventlog" name="*" attribute="eventlog">
     <description>
       Describes what level of log output is desired and where it