Fix Python 2 bugs.

zopefoundation · Mar 1, 2013 · 52f7fb9 · 52f7fb9
1 parent ed5f2eb
commit 52f7fb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/zope/apidoc/utilities.py b/src/zope/apidoc/utilities.py
@@ -30,7 +30,7 @@
 import zope.i18nmessageid
 from zope.container.interfaces import IReadContainer
 
-from zope.apidoc._compat import unicode, MethodType
+from zope.apidoc._compat import unicode, MethodType, PY3
 from zope.apidoc.classregistry import safe_import, IGNORE_MODULES
 
 _ = zope.i18nmessageid.MessageFactory("zope")
@@ -74,7 +74,7 @@ def getPythonPath(obj):
         naked = naked.im_class
         name = naked.__name__
     # Py3 version:
-    if isinstance(naked, types.FunctionType):
+    if PY3 and isinstance(naked, types.FunctionType):
         name = naked.__qualname__.split('.')[0]
     module = getattr(naked, '__module__', _marker)
     if module is _marker:

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
-    py26,py27
-    #,py33
+    py26,py27,py33
 
 [testenv]
 commands =