Merge branch 'fix-py27-tests'

test/doctests.py

@@ -2,6 +2,7 @@
 """Run doctests."""
 
 import doctest
+import platform
 import re
 import sys
 
@@ -10,11 +11,26 @@ try:
 except ImportError:
     import unittest
 
+def _is_new_jpype():
+    if platform.python_implementation() != 'Jython':
+        import jpype
+        try:
+            ver_match = re.match('\d+\.\d+', jpype.__version__)
+            if ver_match:
+                jpype_ver = float(ver_match.group(0))
+                if jpype_ver >= 0.7:
+                    return True
+        except ValueError:
+            pass
+        return False
+
 class Py23DocChecker(doctest.OutputChecker):
     """Doctest checker to avoid Python 2/3 unicode comparison
-    issues. Code taken from Dirkjan Ochtman"""
+    issues. Code mostly taken from Dirkjan Ochtman"""
     def check_output(self, want, got, optionflags):
-        if sys.version_info[0] > 2:
+        if sys.version_info[0] > 2 or _is_new_jpype():
+            # new python has unicode as default
+            # new JPype does not automatically convert to unicode on Python 2
             want = re.sub("u'(.*?)'", "'\\1'", want)
             want = re.sub('u"(.*?)"', '"\\1"', want)
         return doctest.OutputChecker.check_output(self, want, got, optionflags)

tox.ini

@@ -21,7 +21,7 @@ deps =
   oldjpype: JPype1==0.6.3
   py35-newjpype: JPype1==0.7.5
   py36-newjpype: JPype1==0.7.5
-  py27-newjpype: JPype1==0.7.0
+  py27-newjpype: JPype1==0.7.1
   jip==0.9.15
   coverage==4.5.4
 commands =