[Checkins] SVN: zc.relationship/trunk/ - Fixed tests to run on Python 2.6.

[Michael Howitz]

Log message for revision 121338:
  - Fixed tests to run on Python 2.6.
  - Added test extra to declare test dependency on ``zope.app.folder``.
  

Changed:
  U   zc.relationship/trunk/buildout.cfg
  U   zc.relationship/trunk/setup.py
  U   zc.relationship/trunk/src/zc/relationship/CHANGES.txt
  U   zc.relationship/trunk/src/zc/relationship/container.txt

-=-
Modified: zc.relationship/trunk/buildout.cfg
===================================================================
--- zc.relationship/trunk/buildout.cfg	2011-04-08 06:34:34 UTC (rev 121337)
+++ zc.relationship/trunk/buildout.cfg	2011-04-08 06:42:44 UTC (rev 121338)
@@ -6,7 +6,7 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zc.relationship
+eggs = zc.relationship [test]
 defaults = "--tests-pattern [fn]?tests --exit-with-status".split()
 
 [py]

Modified: zc.relationship/trunk/setup.py
===================================================================
--- zc.relationship/trunk/setup.py	2011-04-08 06:34:34 UTC (rev 121337)
+++ zc.relationship/trunk/setup.py	2011-04-08 06:42:44 UTC (rev 121338)
@@ -76,7 +76,7 @@
     packages=find_packages('src'),
     include_package_data=True,
     package_dir= {'':'src'},
-    
+
     namespace_packages=['zc'],
 
     zip_safe=False,
@@ -99,10 +99,14 @@
         'zope.location',
         'zope.index',
         'zc.relation',
-        
+
         'zope.app.testing',
         'zope.app.component',
         'zope.testing',
         'setuptools',
         ],
+    extras_require=dict(
+        test=[
+            'zope.app.folder',
+            ]),
     )

Modified: zc.relationship/trunk/src/zc/relationship/CHANGES.txt
===================================================================
--- zc.relationship/trunk/src/zc/relationship/CHANGES.txt	2011-04-08 06:34:34 UTC (rev 121337)
+++ zc.relationship/trunk/src/zc/relationship/CHANGES.txt	2011-04-08 06:42:44 UTC (rev 121338)
@@ -5,7 +5,7 @@
 2.0
 ===
 
-The 2.x line is almost completely compatible with the 1.x line. 
+The 2.x line is almost completely compatible with the 1.x line.
 The one notable incompatibility does not affect the use of relationship
 containers and is small enough that it will hopefully affect noone.
 
@@ -42,7 +42,7 @@
 
   In these and other cases, you should not ever mutate returned results!
   They may be internal data structures (and are intended to be so, so
-  that they can be used for efficient set operations for other uses). 
+  that they can be used for efficient set operations for other uses).
   The interfaces hopefully clarify what calls will return an internal
   data structure.
 
@@ -61,6 +61,11 @@
   exclusively.  See plone.relations for a zc.relationship container with
   very good test coverage.)
 
+- Fixed tests to run on Python 2.6.
+
+- Added test extra to declare test dependency on ``zope.app.folder``.
+
+
 1.1
 ===
 
@@ -71,7 +76,7 @@
 
 - adjust to BTrees changes in ZODB 3.8 (thanks Juergen Kartnaller)
 
-- converted buildout to rely exclusively on eggs  
+- converted buildout to rely exclusively on eggs
 
 1.0
 ===
@@ -85,10 +90,10 @@
   Markus Kemmerling:
 
   * ManyToOneRelationship instantiation was broken
-  
+
   * The `findRelationships` method misbehaved if both, `source` and `target`,
     are not None, but `bool(target)` evaluated to False.
-    
+
   * ISourceRelationship and ITargetRelationship had errors.
 
 1.0.1

Modified: zc.relationship/trunk/src/zc/relationship/container.txt
===================================================================
--- zc.relationship/trunk/src/zc/relationship/container.txt	2011-04-08 06:34:34 UTC (rev 121337)
+++ zc.relationship/trunk/src/zc/relationship/container.txt	2011-04-08 06:42:44 UTC (rev 121338)
@@ -146,7 +146,7 @@
 direct targets of ob0?
 
     >>> container.findTargets(app['ob0']) # doctest: +ELLIPSIS
-    <generator object at ...>
+    <generator object ...>
 
 Ah-ha! It's a generator!  Let's try that again.
 
@@ -219,7 +219,7 @@
 for some sources.
 
     >>> container.findSources(app['ob0']) # doctest: +ELLIPSIS
-    <generator object at ...>
+    <generator object ...>
     >>> list(container.findSources(app['ob0']))
     []
     >>> list(o.id for o in container.findSources(app['ob4']))
@@ -266,7 +266,7 @@
 deep, like the other methods.
 
     >>> container.findRelationships(source=app['ob0']) # doctest: +ELLIPSIS
-    <generator object at ...>
+    <generator object ...>
     >>> sorted(
     ...     [repr(rel) for rel in path]
     ...     for path in container.findRelationships(source=app['ob0']))
@@ -762,7 +762,7 @@
     ...     for path in container.findRelationships(
     ...         app['ob2'], app['ob4']))
     ...     # doctest: +NORMALIZE_WHITESPACE
-    [['<Relationship from 
+    [['<Relationship from
        (<Demo ob2>, <Demo ob4>, <Demo ob5>, <Demo ob6>, <Demo ob7>)
        to
        (<Demo ob1>, <Demo ob4>, <Demo ob8>, <Demo ob9>, <Demo ob10>)>'],
@@ -773,7 +773,7 @@
 
     >>> list(container.findRelationships(app['ob4'], app['ob4']))
     ... # doctest: +NORMALIZE_WHITESPACE
-    [cycle(<Relationship from 
+    [cycle(<Relationship from
        (<Demo ob2>, <Demo ob4>, <Demo ob5>, <Demo ob6>, <Demo ob7>)
        to
        (<Demo ob1>, <Demo ob4>, <Demo ob8>, <Demo ob9>, <Demo ob10>)>,)]
@@ -880,7 +880,7 @@
     [(<Relationship from (<Demo ob20>,) to (<Demo ob21>,)>,
       <Relationship from (<Demo ob21>,) to (<Demo ob22>,)>,
       <Relationship from (<Demo ob22>,) to (<Demo ob25>,)>)]
-    
+
     >>> list(
     ...     [repr(rel) for rel in path]
     ...     for path in container.findRelationships(