[Checkins] SVN: z3c.baseregistry/trunk/ Moved browser dependencies to 'zmi' extras

Nikolay Kim fafhrd91 at gmail.com
Sun Dec 27 04:01:56 EST 2009


Log message for revision 107147:
  Moved browser dependencies to 'zmi' extras

Changed:
  U   z3c.baseregistry/trunk/CHANGES.txt
  U   z3c.baseregistry/trunk/setup.py
  U   z3c.baseregistry/trunk/src/z3c/baseregistry/README.txt
  U   z3c.baseregistry/trunk/src/z3c/baseregistry/tests/testdoc.py
  U   z3c.baseregistry/trunk/src/z3c/baseregistry/zcml.py

-=-
Modified: z3c.baseregistry/trunk/CHANGES.txt
===================================================================
--- z3c.baseregistry/trunk/CHANGES.txt	2009-12-27 08:51:59 UTC (rev 107146)
+++ z3c.baseregistry/trunk/CHANGES.txt	2009-12-27 09:01:56 UTC (rev 107147)
@@ -2,11 +2,12 @@
 CHANGES
 =======
 
-1.1.1 (unreleased)
+1.2.0 (2009-12-27)
 ------------------
 
-- ...
+- Moved browser dependencies to 'zmi' extras
 
+
 1.1.0 (2009-03-19)
 ------------------
 

Modified: z3c.baseregistry/trunk/setup.py
===================================================================
--- z3c.baseregistry/trunk/setup.py	2009-12-27 08:51:59 UTC (rev 107146)
+++ z3c.baseregistry/trunk/setup.py	2009-12-27 09:01:56 UTC (rev 107147)
@@ -23,7 +23,7 @@
 
 setup (
     name = "z3c.baseregistry",
-    version = "1.1.1dev",
+    version = "1.2.0dev",
     author = "Stephan Richter, Roger Ineichen and the Zope Community",
     author_email = "zope-dev at zope.org",
     description = "Manage IComponents instances using Python code and ZCML.",
@@ -58,17 +58,21 @@
         test=[
             'zope.app.testing',
             'zope.testing',
+            'zope.formlib',
             ],
+        zmi=[
+            'zope.formlib',
+            'zope.app.zcmlfiles',
+            ]
         ),
     install_requires = [
         'setuptools',
         'zope.component',
         'zope.configuration',
-        'zope.formlib',
         'zope.i18nmessageid',
         'zope.interface',
         'zope.schema',
         'zope.site',
         ],
     zip_safe = False,
-)
+    )

Modified: z3c.baseregistry/trunk/src/z3c/baseregistry/README.txt
===================================================================
--- z3c.baseregistry/trunk/src/z3c/baseregistry/README.txt	2009-12-27 08:51:59 UTC (rev 107146)
+++ z3c.baseregistry/trunk/src/z3c/baseregistry/README.txt	2009-12-27 09:01:56 UTC (rev 107147)
@@ -463,7 +463,7 @@
   ... ''', context=context)
   Traceback (most recent call last):
   ...
-  ZopeXMLConfigurationError: File "<string>", line 5.4
+  ZopeXMLConfigurationError: File "<string>", line 5...
     ConfigurationError: Nested ``registerIn`` directives are not permitted.
 
 

Modified: z3c.baseregistry/trunk/src/z3c/baseregistry/tests/testdoc.py
===================================================================
--- z3c.baseregistry/trunk/src/z3c/baseregistry/tests/testdoc.py	2009-12-27 08:51:59 UTC (rev 107146)
+++ z3c.baseregistry/trunk/src/z3c/baseregistry/tests/testdoc.py	2009-12-27 09:01:56 UTC (rev 107147)
@@ -19,7 +19,6 @@
 import doctest
 import unittest
 from zope.app.testing import placelesssetup, setup
-from zope.testing.doctestunit import DocFileSuite
 
 def setUp(test):
     placelesssetup.setUp(test)
@@ -30,11 +29,12 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocFileSuite('../README.txt',
-                     setUp=setUp, tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
-        ))
+            doctest.DocFileSuite(
+                '../README.txt',
+                setUp=setUp, tearDown=tearDown,
+                optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+                ),
+            ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

Modified: z3c.baseregistry/trunk/src/z3c/baseregistry/zcml.py
===================================================================
--- z3c.baseregistry/trunk/src/z3c/baseregistry/zcml.py	2009-12-27 08:51:59 UTC (rev 107146)
+++ z3c.baseregistry/trunk/src/z3c/baseregistry/zcml.py	2009-12-27 09:01:56 UTC (rev 107147)
@@ -21,15 +21,14 @@
 import zope.configuration.config
 import zope.configuration.fields
 from zope.configuration.exceptions import ConfigurationError
-from zope.i18nmessageid import ZopeMessageFactory as _
 
 
 class IRegisterInDirective(zope.interface.Interface):
     """Use the specified registry for registering the contained components."""
 
     registry = zope.configuration.fields.GlobalObject(
-        title=_("Registry"),
-        description=_("Python path to the registry to use."),
+        title=u"Registry",
+        description=u"Python path to the registry to use.",
         required=True)
 
 
@@ -113,4 +112,3 @@
             callable=resetOriginalRegistry,
             args=(self,)
             )
-



More information about the checkins mailing list