Merge 33e8b34 into f4c7d11

.travis.yml

@@ -1,11 +1,14 @@
 language: python
+dist: xenial
 python:
     - 2.7
     - 3.4
     - 3.5
     - 3.6
-    - pypy
-    - pypy3
+    - 3.7
+    - 3.8-dev
+    - pypy2.7-6.0
+    - pypy3.5-6.0
 install:
     - pip install -U pip setuptools
     - pip install -U zope.testrunner coverage coveralls

CHANGES.rst

@@ -4,7 +4,7 @@ CHANGES
 1.3 (unreleased)
 ================
 
-- Nothing changed yet.
+- Add support for Python 3.7 and 3.8.
 
 
 1.2 (2018-05-09)

setup.py

@@ -42,6 +42,8 @@ def read(*rnames):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
@@ -55,6 +57,7 @@ def read(*rnames):
     install_requires=[
         'zope.interface',
         'setuptools',
+        'six',
     ],
     extras_require=dict(test=['zope.testing']),
 )

src/martian/compat3.py

@@ -1,4 +1,4 @@
-import sys
+import six
 import types
 
 
@@ -8,7 +8,7 @@
     CLASS_TYPES = (type,)
 
 
-if sys.version_info[0] < 3:
+if six.PY2:
     str = unicode  # NOQA
 else:
     str = str

src/martian/directive.py

@@ -1,3 +1,4 @@
+import six
 import sys
 import inspect
 
@@ -262,12 +263,11 @@ def __init__(self, *args, **kw):
     # To get a correct error message, we construct a function that has
     # the same signature as factory(), but without "self".
     def check_factory_signature(self, *arguments, **kw):
-        if sys.version_info.major == 2:
+        if six.PY2:
             (args, varargs, varkw, defaults) = inspect.getargspec(self.factory)
+            argspec = inspect.formatargspec(args[1:], varargs, varkw, defaults)
         else:
-            (args, varargs, varkw, defaults,
-             _, __, ___) = inspect.getfullargspec(self.factory)
-        argspec = inspect.formatargspec(args[1:], varargs, varkw, defaults)
+            argspec = str(inspect.signature(self.factory))
         ns = dict()
         exec("def signature_checker" + argspec + ": pass", dict(), ns)
         try:

src/martian/testing.py

@@ -1,3 +1,4 @@
+import six
 import sys
 from types import ModuleType
 from types import FunctionType
@@ -65,7 +66,7 @@ def __init__(cls, classname, bases, dict_):
         return type.__init__(cls, classname, bases, dict_)
 
 
-if sys.version_info[0] < 3:
+if six.PY2:
 
     class FakeModuleObject(object):
         pass

src/martian/util.py

@@ -15,6 +15,7 @@
 """
 
 import re
+import six
 import sys
 import inspect
 
@@ -26,18 +27,14 @@
 
 def not_unicode_or_ascii(value):
     # python3 compatibility
-    if sys.version_info < (3,) and isinstance(value, unicode):  # NOQA
+    if six.PY2 and isinstance(value, unicode):  # NOQA
         return False
     if not isinstance(value, str):
         return True
     return is_not_ascii(value)
 
 
-# extra compatibility for python3.2
-if sys.version_info < (3,):
-    is_not_ascii = re.compile(eval(r'u"[\u0080-\uffff]"')).search
-else:
-    is_not_ascii = re.compile(eval(r'"[\u0080-\uffff]"')).search
+is_not_ascii = re.compile(eval(r'u"[\u0080-\uffff]"')).search
 
 
 def isclass(obj):

tox.ini

@@ -4,6 +4,8 @@ envlist =
     py34,
     py35,
     py36,
+    py37,
+    py38,
     pypy,
     pypy3,
     coverage-report