[Checkins] SVN: zope.generations/trunk/src/zope/ moved modules

[Michael Howitz]

Log message for revision 116549:
  moved modules
  

Changed:
  U   zope.generations/trunk/src/zope/__init__.py
  D   zope.generations/trunk/src/zope/app/
  A   zope.generations/trunk/src/zope/generations/
  U   zope.generations/trunk/src/zope/generations/README.txt
  D   zope.generations/trunk/src/zope/generations/browser/
  U   zope.generations/trunk/src/zope/generations/demo/__init__.py

-=-
Modified: zope.generations/trunk/src/zope/__init__.py
===================================================================
--- zope.generations/trunk/src/zope/__init__.py	2010-09-18 08:04:00 UTC (rev 116548)
+++ zope.generations/trunk/src/zope/__init__.py	2010-09-18 08:25:05 UTC (rev 116549)
@@ -1,7 +1 @@
-# this is a namespace package
-try:
-    import pkg_resources
-    pkg_resources.declare_namespace(__name__)
-except ImportError:
-    import pkgutil
-    __path__ = pkgutil.extend_path(__path__, __name__)
+__import__('pkg_resources').declare_namespace(__name__)

Modified: zope.generations/trunk/src/zope/generations/README.txt
===================================================================
--- zope.generations/trunk/src/zope/app/generations/README.txt	2010-09-17 13:00:50 UTC (rev 116524)
+++ zope.generations/trunk/src/zope/generations/README.txt	2010-09-18 08:25:05 UTC (rev 116549)
@@ -44,8 +44,8 @@
 because it uses Python modules to manage generations.  For now, it
 will be just fine, since we don't want it to do anything just yet.
 
-    >>> from zope.app.generations.interfaces import ISchemaManager
-    >>> from zope.app.generations.generations import SchemaManager
+    >>> from zope.generations.interfaces import ISchemaManager
+    >>> from zope.generations.generations import SchemaManager
     >>> dummy_manager = SchemaManager(minimum_generation=0, generation=0)
     >>> ztapi.provideUtility(ISchemaManager, dummy_manager, name='some.app')
 
@@ -62,14 +62,14 @@
     ...         self.database = database
     >>> event = DatabaseOpenedEventStub(db)
 
-    >>> from zope.app.generations.generations import evolveMinimumSubscriber
+    >>> from zope.generations.generations import evolveMinimumSubscriber
     >>> evolveMinimumSubscriber(event)
 
 The consequence of this action is that now the database contains the fact
 that our current schema number is 0.  When we update the schema, Zope3 will
 have an idea of what the starting point was.  Here, see?
 
-    >>> from zope.app.generations.generations import generations_key
+    >>> from zope.generations.generations import generations_key
     >>> root[generations_key]['some.app']
     0
 
@@ -135,7 +135,7 @@
 
 In real life you will have much more complex object structures than the one
 here.  To make your life easier, there are two very useful functions available
-in zope.app.generations.utility: findObjectsMatching() and
+in zope.generations.utility: findObjectsMatching() and
 findObjectsProviding().  They will dig through containers recursively to help
 you seek out old objects that you wish to update, by interface or by some other
 criteria.  They are easy to understand, check their docstrings.
@@ -168,7 +168,7 @@
 We see that generations are working, so we decide to take the next step
 and evolve to generation 2.  Let's see how this can be done manually:
 
-    >>> from zope.app.generations.generations import evolve
+    >>> from zope.generations.generations import evolve
     >>> evolve(db)
 
     >>> pprint(root['answers'])
@@ -299,7 +299,7 @@
 
     >>> ztapi.unprovideUtility(ISchemaManager, name='some.app')
 
-    >>> from zope.app.generations.interfaces import IInstallableSchemaManager
+    >>> from zope.generations.interfaces import IInstallableSchemaManager
     >>> class MySchemaManager(object):
     ...     implements(IInstallableSchemaManager)
     ...

Modified: zope.generations/trunk/src/zope/generations/demo/__init__.py
===================================================================
--- zope.generations/trunk/src/zope/app/generations/demo/__init__.py	2010-09-17 13:00:50 UTC (rev 116524)
+++ zope.generations/trunk/src/zope/generations/demo/__init__.py	2010-09-18 08:25:05 UTC (rev 116549)
@@ -14,13 +14,13 @@
 """Demo package for evolution scripts
 
 The evolution scripts in this package are pretty dumb. The just call
-the evolve function defined here with a generation number. 
+the evolve function defined here with a generation number.
 
 $Id$
 """
 __docformat__ = 'restructuredtext'
 
-key = 'zope.app.generations.demo-generation'
+key = 'zope.generations.demo-generation'
 
 def evolve(context, generation):
     """Demo that "evolves" a database.