Merge lp:~jseutter/testresources/py3_without_distribute into lp:~testresources-developers/testresources/trunk

[Jerry Seutter]

This MP is like the previous py 3 MP, but without the addition of distribute_setup. It adds support for Python 3.

See the original MP if more information is needed: https://code.launchpad.net/~jseutter/testresources/py3/+merge/105525

[Barry Warsaw (barry)]

This looks pretty good to me. Unfortunately the test suite has a hidden dependency on fixtures, so that needs to get ported too. :(

% python test_all.py
Traceback (most recent call last):
  File "test_all.py", line 127, in <module>
    sys.exit(main(sys.argv))
  File "test_all.py", line 119, in main
    test_suite().visit(visitor)
  File "test_all.py", line 82, in test_suite
    result.addTest(testresources.test_suite())
  File "/tmp/tr/lib/python3.2/site-packages/testresources-0.2.5-py3.2.egg/testresources/__init__.py", line 29, in test_suite
    return testresources.tests.test_suite()
  File "/tmp/tr/lib/python3.2/site-packages/testresources-0.2.5-py3.2.egg/testresources/tests/__init__.py", line 27, in test_suite
    import testresources.tests.test_test_resource
  File "/tmp/tr/lib/python3.2/site-packages/testresources-0.2.5-py3.2.egg/testresources/tests/test_test_resource.py", line 18, in <module>
    from fixtures.tests.helpers import LoggingFixture
ImportError: No module named fixtures.tests.helpers

review: Approve

[Jerry Seutter (jseutter)]

> This looks pretty good to me. Unfortunately the test suite has a hidden
> dependency on fixtures, so that needs to get ported too. :(

Oh right, I'll upload a patch for that fairly quickly..

Unmerged revisions

61. By Jerry Seutter on 2012-05-12

Adding support for Python 3.

=== modified file 'lib/testresources/__init__.py'
--- lib/testresources/__init__.py	2011-05-03 18:38:27 +0000
+++ lib/testresources/__init__.py	2012-05-12 22:32:19 +0000
@@ -21,6 +21,7 @@
 import inspect
 import operator
 import unittest
+import collections
 
 
 def test_suite():
@@ -41,12 +42,12 @@
         No other edges are created.
     """
     result = {}
-    for from_node, from_prime_node in prime_node_mapping.iteritems():
+    for from_node, from_prime_node in prime_node_mapping.items():
         result[from_node] = {from_prime_node:0}
         result[from_prime_node] = {from_node:0}
-    for from_node, to_nodes in digraph.iteritems():
+    for from_node, to_nodes in digraph.items():
         from_prime = prime_node_mapping[from_node]
-        for to_node, value in to_nodes.iteritems():
+        for to_node, value in to_nodes.items():
             to_prime = prime_node_mapping[to_node]
             result[from_prime][to_node] = value
             result[to_node][from_prime] = value
@@ -72,8 +73,8 @@
     # collect edges: every edge is present twice (due to the graph
     # representation), so normalise.
     edges = set()
-    for from_node, to_nodes in graph.iteritems():
-        for to_node, value in to_nodes.iteritems():
+    for from_node, to_nodes in graph.items():
+        for to_node, value in to_nodes.items():
             edge = (value,) + tuple(sorted([from_node, to_node]))
             edges.add(edge)
     edges = list(edges)
@@ -87,7 +88,7 @@
             continue # already joined
         # combine g1 and g2 into g1
         graphs -= 1
-        for from_node, to_nodes in g2.iteritems():
+        for from_node, to_nodes in g2.items():
             #remember its symmetric, don't need to do 'to'.
             forest[from_node] = g1
             g1.setdefault(from_node, {}).update(to_nodes)
@@ -96,10 +97,10 @@
         g1[edge[2]][edge[1]] = edge[0]
     # union the remaining graphs
     _, result = forest.popitem()
-    for _, g2 in forest.iteritems():
+    for _, g2 in forest.items():
         if g2 is result: # common case
             continue
-        for from_node, to_nodes in g2.iteritems():
+        for from_node, to_nodes in g2.items():
             result.setdefault(from_node, {}).update(to_nodes)
     return result
 
@@ -120,7 +121,7 @@
         for resource in resource_set:
             edges.setdefault(resource, []).append(node)
     # populate the adjacent members of nodes
-    for node, connected in nodes.iteritems():
+    for node, connected in nodes.items():
         for resource in node:
             connected.update(edges[resource])
         connected.discard(node)
@@ -361,7 +362,7 @@
         node = root
         cycle = [node]
         steps = 2 * (len(mst) - 1)
-        for step in xrange(steps):
+        for step in range(steps):
             found = False
             outgoing = None # For clearer debugging.
             for outgoing in mst[node]:
@@ -438,7 +439,7 @@
     def _call_result_method_if_exists(self, result, methodname, *args):
         """Call a method on a TestResult that may exist."""
         method = getattr(result, methodname, None)
-        if callable(method):
+        if isinstance(method, collections.Callable):
             method(*args)
 
     def _clean_all(self, resource, result):
@@ -518,7 +519,7 @@
         for name, resource in self.resources:
             dependency_resources[name] = resource.getResource()
         resource = self.make(dependency_resources)
-        for name, value in dependency_resources.items():
+        for name, value in list(dependency_resources.items()):
             setattr(resource, name, value)
         self._call_result_method_if_exists(result, "stopMakeResource", self)
         return resource

=== modified file 'lib/testresources/tests/TestUtil.py'
--- lib/testresources/tests/TestUtil.py	2008-08-16 07:10:40 +0000
+++ lib/testresources/tests/TestUtil.py	2012-05-12 22:32:19 +0000
@@ -15,6 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
+from __future__ import print_function
 
 import sys
 import logging
@@ -56,7 +57,7 @@
                 visitor.visitSuite(test)
                 visitTests(test, visitor)
             else:
-                print "unvisitable non-unittest.TestCase element %r (%r)" % (test, test.__class__)
+                print("unvisitable non-unittest.TestCase element %r (%r)" % (test, test.__class__))
 
 
 class TestSuite(unittest.TestSuite):

=== modified file 'lib/testresources/tests/test_resource_graph.py'
--- lib/testresources/tests/test_resource_graph.py	2010-02-26 22:40:43 +0000
+++ lib/testresources/tests/test_resource_graph.py	2012-05-12 22:32:19 +0000
@@ -132,8 +132,8 @@
             F:{               D:6},
             G:{                     E:9}}
         result = testresources._kruskals_graph_MST(graph)
-        e_weight = sum(sum(row.itervalues()) for row in expected.itervalues())
-        r_weight = sum(sum(row.itervalues()) for row in result.itervalues())
+        e_weight = sum(sum(row.values()) for row in expected.values())
+        r_weight = sum(sum(row.values()) for row in result.values())
         self.assertEqual(e_weight, r_weight)
         self.assertEqual(expected,
             testresources._kruskals_graph_MST(graph))

=== modified file 'lib/testresources/tests/test_resourced_test_case.py'
--- lib/testresources/tests/test_resourced_test_case.py	2011-05-04 22:08:24 +0000
+++ lib/testresources/tests/test_resourced_test_case.py	2012-05-12 22:32:19 +0000
@@ -129,7 +129,7 @@
         self.resourced_case.resources = [("foo", self.resource_manager)]
         self.resourced_case.setUpResources()
         self.resourced_case.tearDownResources()
-        self.failIf(hasattr(self.resourced_case, "foo"))
+        self.assertFalse(hasattr(self.resourced_case, "foo"))
 
     def testTearDownResourcesStopsUsingResource(self):
         # tearDownResources records that there is one less use of each
@@ -158,5 +158,5 @@
         self.assertEqual(self.resourced_case.foo, self.resource)
         self.assertEqual(self.resource_manager._uses, 1)
         self.resourced_case.tearDown()
-        self.failIf(hasattr(self.resourced_case, "foo"))
+        self.assertFalse(hasattr(self.resourced_case, "foo"))
         self.assertEqual(self.resource_manager._uses, 0)

=== modified file 'lib/testresources/tests/test_test_resource.py'
--- lib/testresources/tests/test_test_resource.py	2010-11-14 17:43:44 +0000
+++ lib/testresources/tests/test_test_resource.py	2012-05-12 22:32:19 +0000
@@ -127,7 +127,7 @@
     def testGetResourceReturnsMakeResource(self):
         resource_manager = MockResource()
         resource = resource_manager.getResource()
-        self.assertEqual(resource_manager.make({}), resource)
+        self.assertEqual(type(resource_manager.make({})), type(resource))
 
     def testGetResourceIncrementsUses(self):
         resource_manager = MockResource()

=== modified file 'setup.py'
--- setup.py	2012-01-27 04:59:50 +0000
+++ setup.py	2012-05-12 22:32:19 +0000
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 import os.path
 
-description = file(os.path.join(os.path.dirname(__file__), 'README'), 'rb').read()
+description = open(os.path.join(os.path.dirname(__file__), 'README'), 'rb').read()
+description = description.decode('utf-8')
 
 setup(name="testresources",
       version="0.2.5",
@@ -25,4 +26,10 @@
           'Topic :: Software Development :: Quality Assurance',
           'Topic :: Software Development :: Testing',
           ],
+      extras_require = dict(
+          test=[
+              'testtools',
+               ]
+          ),
+       test_suite="testresources.tests",
       )