Merge pull request #5014 from jenshnielsen/python36nightly

tacaswell · tacaswell · commit 7682bb190cd2 · 2015-09-15T07:58:57.000-04:00
FIX/TST: Add 3.6 compatibility testing
diff --git a/.travis.yml b/.travis.yml
@@ -46,6 +46,10 @@ matrix:
       env: BUILD_DOCS=true MOCK=mock
     - python: "3.5.0rc4"
       env: PRE=--pre
+    - python: "nightly"
+      env: PRE=--pre
+  allow_failures:
+    - python: "nightly"
 
 before_install:
   - source tools/travis_tools.sh
diff --git a/boilerplate.py b/boilerplate.py
@@ -214,8 +214,11 @@ def format_value(value):
             has_data = 'data' in inspect.signature(base_func).parameters
             work_func = inspect.unwrap(base_func)
 
-            args, varargs, varkw, defaults = inspect.getargspec(work_func)
-
+            if six.PY2:
+                args, varargs, varkw, defaults = inspect.getargspec(work_func)
+            else:
+                (args, varargs, varkw, defaults, kwonlyargs, kwonlydefs,
+                    annotations) = inspect.getfullargspec(work_func)
             args.pop(0)  # remove 'self' argument
             if defaults is None:
                 defaults = ()
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1110,7 +1110,11 @@ def _get_setters_and_targets(self):
             o = getattr(self.o, name)
             if not six.callable(o):
                 continue
-            if len(inspect.getargspec(o)[0]) < 2:
+            if six.PY2:
+                nargs = len(inspect.getargspec(o)[0])
+            else:
+                nargs = len(inspect.getfullargspec(o)[0])
+            if nargs < 2:
                 continue
             func = o
             if self.is_alias(func):
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -1781,7 +1781,11 @@ def _pprint_styles(_styles):
     _table = [["Class", "Name", "Attrs"]]
 
     for name, cls in sorted(_styles.items()):
-        args, varargs, varkw, defaults = inspect.getargspec(cls.__init__)
+        if six.PY2:
+            args, varargs, varkw, defaults = inspect.getargspec(cls.__init__)
+        else:
+            (args, varargs, varkw, defaults, kwonlyargs, kwonlydefs,
+                annotations) = inspect.getfullargspec(cls.__init__)
         if defaults:
             args = [(argname, argdefault)
                     for argname, argdefault in zip(args[1:], defaults)]
