[Zope3-checkins] SVN: Zope3/branches/3.3/ Merge from trunk:

[Philipp von Weitershausen]

Log message for revision 68113:
  Merge from trunk:
  - make generation match code a bit more efficient by using generators
  - fix collector #603: Missing packaging info for BBB package in zope.app.
  - evolvement script for moved dublincore data
  

Changed:
  U   Zope3/branches/3.3/doc/CHANGES.txt
  U   Zope3/branches/3.3/src/zope/app/PACKAGE.cfg
  U   Zope3/branches/3.3/src/zope/app/generations/utility.py
  U   Zope3/branches/3.3/src/zope/app/zopeappgenerations/__init__.py
  A   Zope3/branches/3.3/src/zope/app/zopeappgenerations/evolve5.py

-=-
Modified: Zope3/branches/3.3/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.3/doc/CHANGES.txt	2006-05-12 16:37:54 UTC (rev 68112)
+++ Zope3/branches/3.3/doc/CHANGES.txt	2006-05-12 17:57:35 UTC (rev 68113)
@@ -6,8 +6,17 @@
 
   For information on future releases, see ROADMAP.txt.
 
-  Zope 3.3.x (date)
+  Zope 3.3.0b2 (UNRELEASED)
 
+    Bugfixes
+
+      - Include backward-compatibility packages in zope.app in the
+        release.  They were left out in 3.3.0b1 by mistake.
+
+      - Provide ZODB migration script for moved DublinCore classes.
+
+  Zope 3.3.0b1 (2006/05/08)
+
     New features
 
       - Provided a new component registry API that allows multiple

Modified: Zope3/branches/3.3/src/zope/app/PACKAGE.cfg
===================================================================
--- Zope3/branches/3.3/src/zope/app/PACKAGE.cfg	2006-05-12 16:37:54 UTC (rev 68112)
+++ Zope3/branches/3.3/src/zope/app/PACKAGE.cfg	2006-05-12 17:57:35 UTC (rev 68113)
@@ -41,8 +41,6 @@
 debug
 dependable
 error
-# event is BBB
-event
 exception
 folder
 form
@@ -72,4 +70,22 @@
 wsgi
 zopeappgenerations
 zapi
+
+# BBB 2005/05/01 -- to be removed after 12 months
+
+annotation
+content_types.py
+copypastemove
+datetimeutils.py
+decorator.py
+dublincore
+event
+filerepresentation
+location
+mail
+rdb
+size
+traversing
+timezones.py
+
 </collection>

Modified: Zope3/branches/3.3/src/zope/app/generations/utility.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/generations/utility.py	2006-05-12 16:37:54 UTC (rev 68112)
+++ Zope3/branches/3.3/src/zope/app/generations/utility.py	2006-05-12 17:57:35 UTC (rev 68113)
@@ -64,17 +64,14 @@
     >>> names
     ['a2', 'b2', 'c2']
     """
-    matches = []
     if condition(root):
-        matches.append(root)
+        yield root
 
     if hasattr(root, 'values'):
         for subobj in root.values():
-            matches += findObjectsMatching(subobj, condition)
+            for match in findObjectsMatching(subobj, condition):
+                yield match
 
-    return matches
-
-
 def findObjectsProviding(root, interface):
     """Find all objects in the root that provide the specified interface.
 
@@ -127,4 +124,5 @@
     >>> names
     ['a1', 'a2', 'a3', 'c1', 'c2']
     """
-    return findObjectsMatching(root, interface.providedBy)
+    for match in findObjectsMatching(root, interface.providedBy):
+        yield match

Modified: Zope3/branches/3.3/src/zope/app/zopeappgenerations/__init__.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/zopeappgenerations/__init__.py	2006-05-12 16:37:54 UTC (rev 68112)
+++ Zope3/branches/3.3/src/zope/app/zopeappgenerations/__init__.py	2006-05-12 17:57:35 UTC (rev 68113)
@@ -24,7 +24,7 @@
 
 ZopeAppSchemaManager = SchemaManager(
     minimum_generation=1,
-    generation=4,
+    generation=5,
     package_name=key)
 
 

Copied: Zope3/branches/3.3/src/zope/app/zopeappgenerations/evolve5.py (from rev 68112, Zope3/trunk/src/zope/app/zopeappgenerations/evolve5.py)