Fixes to support Python 3

betahaus/viewcomponent/fixtures/contexts.py

@@ -1,7 +1,7 @@
 from pyramid.testing import DummyResource
 
 from zope.interface import Interface
-from zope.interface import implements
+from zope.interface import implementer
 
 
 class IRoot(Interface):
@@ -11,8 +11,10 @@ class IOrganisation(Interface):
     pass
 
 
+@implementer(IRoot)
 class Root(DummyResource):
-    implements(IRoot)
+    pass
 
+@implementer(IOrganisation)
 class Organisation(DummyResource):
-    implements(IOrganisation)
+    pass

betahaus/viewcomponent/models.py

@@ -1,15 +1,15 @@
-from zope.interface import implements
+from zope.interface import implementer
 from pyramid.security import has_permission
 from pyramid.traversal import find_interface
 
 from betahaus.viewcomponent.interfaces import IViewGroup
 
 
+@implementer(IViewGroup)
 class ViewGroup(object):
     """ Named utility for views. Behaves like an ordered dict with some extra funkyness.
         See interfaces.py for documentation.
     """
-    implements(IViewGroup)
 
     def __init__(self, name = None, perm_checker = None):
         self.name = name
@@ -28,8 +28,10 @@ def __call__(self, context, request, **kw):
             for va in self.get_context_vas(context, request):
                 try:
                     output = va(context, request, **kw)
-                except Exception, exc:
-                    exc.message = "ViewAction '%s' of ViewGroup '%s' raised an exception: %s" % (va.name, self.name, exc.message)
+                except Exception as exc:
+                    eargs = list(exc.args)
+                    eargs[0] = "ViewAction '%s' of ViewGroup '%s' raised an exception: %s" % (va.name, self.name, exc.args[0])
+                    exc.args = eargs
                     raise exc
                 if not isinstance(output, basestring):
                     raise TypeError("ViewAction '%s' of ViewGroup '%s' didn't return a string. Output was: %s" % (va.name, self.name, output))

betahaus/viewcomponent/tests.py

@@ -90,7 +90,7 @@ def test_call_exception_from_va(self):
         try:
             obj(None, None)
         except Exception, exc:
-            self.failUnless('this_view_group' in exc.message)
+            self.failUnless('this_view_group' in exc.args[0])
 
     def test_default_order(self):
         obj = self._cut()
@@ -272,7 +272,8 @@ def test_render_view_groups(self):
         context = testing.DummyResource()
         self.config.include("betahaus.viewcomponent.fixtures.dummy")
         res = self._fut(context, request, 'html')
-        expected = "pyramid.testing.DummyResource, <class 'pyramid.testing.DummyRequest'>, <betahaus.viewcomponent.models.ViewAction 'stuff'>"
+        expected = "{}, {}, <betahaus.viewcomponent.models.ViewAction 'stuff'>".format(
+            testing.DummyResource, testing.DummyRequest)
         self.assertEqual(res, expected)
 
 

setup.py

@@ -33,6 +33,7 @@
       install_requires=requires,
       tests_require=requires,
       test_suite="betahaus.viewcomponent",
+      use_2to3=True,
       entry_points = """\
       """,
       paster_plugins=['pyramid'],