Merge branch '1.7-release'

KunKaxx · Jan 24, 2018 · f886f08 · f886f08
2 parents cfd9528 + 0a82ba0
commit f886f08
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -48,6 +48,7 @@ Bugs fixed
 
 * #4415: autodoc classifies inherited classmethods as regular methods
 * #4415: autodoc classifies inherited staticmethods as regular methods
+* #4472: DOCUMENTATION_OPTIONS is not defined
 
 Testing
 --------

diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
@@ -15,7 +15,6 @@
 import sys
 import time
 import codecs
-import platform
 from os import path
 import doctest
 
@@ -144,7 +143,8 @@ def run(self):
         if self.name == 'doctest' and 'pyversion' in self.options:
             try:
                 spec = self.options['pyversion']
-                if not is_allowed_version(spec, platform.python_version()):
+                python_version = '.'.join(str(v) for v in sys.version_info[:3])
+                if not is_allowed_version(spec, python_version):
                     flag = doctest.OPTIONFLAGS_BY_NAME['SKIP']
                     node['options'][flag] = True  # Skip the test
             except InvalidSpecifier:

diff --git a/...x/themes/basic/documentation_options.js_t → ...s/basic/static/documentation_options.js_t b/...x/themes/basic/documentation_options.js_t → ...s/basic/static/documentation_options.js_t
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
@@ -453,7 +453,8 @@ def format_annotation(self, annotation):
 
         if annotation.__module__ == 'builtins':
             return annotation.__qualname__  # type: ignore
-        elif isinstance(annotation, typing.GenericMeta):
+        elif (hasattr(typing, 'GenericMeta') and  # for py36 or below
+              isinstance(annotation, typing.GenericMeta)):
             # In Python 3.5.2+, all arguments are stored in __args__,
             # whereas __parameters__ only contains generic parameters.
             #
@@ -480,7 +481,8 @@ def format_annotation(self, annotation):
             if params is not None:
                 param_str = ', '.join(self.format_annotation(p) for p in params)
                 return '%s[%s]' % (qualified_name, param_str)
-        elif (isinstance(annotation, typing.CallableMeta) and  # type: ignore
+        elif (hasattr(typing, 'CallableMeta') and  # for py36 or below
+              isinstance(annotation, typing.CallableMeta) and  # type: ignore
               getattr(annotation, '__args__', None) is not None and
               hasattr(annotation, '__result__')):
             # Skipped in the case of plain typing.Callable
@@ -495,7 +497,8 @@ def format_annotation(self, annotation):
             return '%s[%s, %s]' % (qualified_name,
                                    args_str,
                                    self.format_annotation(annotation.__result__))
-        elif (isinstance(annotation, typing.TupleMeta) and  # type: ignore
+        elif (hasattr(typing, 'TupleMeta') and  # for py36 or below
+              isinstance(annotation, typing.TupleMeta) and  # type: ignore
               hasattr(annotation, '__tuple_params__') and
               hasattr(annotation, '__tuple_use_ellipsis__')):
             params = annotation.__tuple_params__

diff --git a/tests/test_ext_math.py b/tests/test_ext_math.py
@@ -11,6 +11,7 @@
 
 import os
 import re
+import errno
 import subprocess
 
 import pytest
@@ -20,7 +21,7 @@ def has_binary(binary):
     try:
         subprocess.check_output([binary])
     except OSError as e:
-        if e.errno == os.errno.ENOENT:
+        if e.errno == errno.ENOENT:
             # handle file not found error.
             return False
         else:

diff --git a/tests/test_util_inspect.py b/tests/test_util_inspect.py
@@ -215,7 +215,12 @@ def test_Signature_annotations():
 
     # TypeVars and generic types with TypeVars
     sig = inspect.Signature(f2).format_args()
-    assert sig == '(x: List[T], y: List[T_co], z: T) -> List[T_contra]'
+    if sys.version_info < (3, 7):
+        sig == ('(x: typing.List[T], y: typing.List[T_co], z: T) -> '
+                'typing.List[T_contra]')
+    else:
+        sig == ('(x: typing.List[~T], y: typing.List[+T_co], z: T) -> '
+                'typing.List[-T_contra]')
 
     # Union types
     sig = inspect.Signature(f3).format_args()