Python3 support

zopefoundation · Sep 28, 2016 · 3382a95 · 3382a95
1 parent f4ced45
commit 3382a95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/grokcore/annotation/components.py b/src/grokcore/annotation/components.py
@@ -25,10 +25,10 @@
 import grokcore.component
 
 
+@grokcore.component.implementer(IAttributeAnnotatable)
 class Model(grokcore.component.Context):
     """Base class for an object which is able to handle annotations
     """
-    grokcore.component.implements(IAttributeAnnotatable)
 
 
 class Annotation(persistent.Persistent, contained.Contained):
@@ -38,8 +38,8 @@ class Annotation(persistent.Persistent, contained.Contained):
     """
 
 
+@grokcore.component.implementer(IAnnotationFactory)
 class AnnotationFactory(object):
-    implements(IAnnotationFactory)
 
     def __init__(self, factory, name):
         self.factory = factory

diff --git a/src/grokcore/annotation/testing.py b/src/grokcore/annotation/testing.py
@@ -13,6 +13,7 @@
 ##############################################################################
 """Grok test helpers
 """
+from __future__ import print_function
 import sys
 from zope.configuration.config import ConfigurationMachine
 from grokcore.component import zcml
@@ -37,7 +38,7 @@ def warn(message, category=None, stacklevel=1):
 
     When zope.deprecation is fixed, this warn function can be removed again.
     """
-    print "From grok.testing's warn():"
+    print("From grok.testing's warn():")
 
     frame = sys._getframe(stacklevel)
     path = frame.f_globals['__file__']
@@ -49,10 +50,10 @@ def warn(message, category=None, stacklevel=1):
     for i in range(lineno):
         line = file.readline()
 
-    print "%s:%s: %s: %s\n  %s" % (
+    print("{}:{}: {}: {}\n  {}".format(
         path,
         frame.f_lineno,
         category.__name__,
         message,
         line.strip(),
-        )
+        ))