Fix type hints, and tests on py36 and py37

Author: domdfcoding

sphinx_autofixture/__init__.py

@@ -29,8 +29,8 @@
 # stdlib
 import ast
 import inspect
-from types import FunctionType
-from typing import Any, Dict, Optional, Tuple
+from types import FunctionType, MethodType
+from typing import Any, Dict, Optional, Tuple, Union
 
 # 3rd party
 from sphinx.application import Sphinx
@@ -67,12 +67,14 @@ def visit_FunctionDef(self, node: ast.FunctionDef) -> Any:
 			for deco in node.decorator_list:
 
 				if isinstance(deco, ast.Call):
-					keywords: Dict[str, ast.Constant] = {k.arg: k.value for k in deco.keywords}
+					keywords: Dict[Optional[str], ast.expr] = {k.arg: k.value for k in deco.keywords}
 
 					if "scope" in keywords:
 						scope = keywords["scope"]
 						if isinstance(scope, ast.Constant):
 							self.scope = scope.value
+						elif isinstance(scope, ast.Str):
+							self.scope = scope.s
 						else:  # pragma: no cover
 							raise NotImplementedError(type(scope))
 
@@ -92,7 +94,7 @@ def visit_FunctionDef(self, node: ast.FunctionDef) -> Any:
 					raise NotImplementedError(str(type(deco)))
 
 
-def is_fixture(function: FunctionType) -> Tuple[bool, Optional[str]]:
+def is_fixture(function: Union[FunctionType, MethodType]) -> Tuple[bool, Optional[str]]:
 	"""
 	Returns whether the given function is a fixture, and the fixture's scope if it is.
 
@@ -121,7 +123,7 @@ class FixtureDocumenter(FunctionDocumenter):
 	objtype = "fixture"
 	directivetype = "fixture"
 	priority = 20
-	object: FunctionType  # noqa: A003
+	object: Union[FunctionType, MethodType]  # noqa: A003
 
 	def __init__(self, directive: DocumenterBridge, name: str, indent: str = '') -> None:
 		super().__init__(directive, name, indent)

tests/test_is_fixture.py

@@ -1,6 +1,8 @@
+# 3rd party
 import pytest
 from pytest import fixture
 
+# this package
 from sphinx_autofixture import is_fixture
 
 
@@ -49,37 +51,48 @@ def pytest_call_scoped():
 	"""
 
 
-@pytest.mark.parametrize("func, scope", [
-		pytest.param(name, "function", id="name"),
-		pytest.param(call, "function", id="call"),
-		pytest.param(call_scoped, "module", id="call_scoped"),
-		pytest.param(pytest_attribute, "function", id="pytest_attribute"),
-		pytest.param(pytest_call, "function", id="pytest_call"),
-		pytest.param(pytest_call_scoped, "module", id="pytest_call_scoped"),
-		])
+@pytest.mark.parametrize(
+		"func, scope",
+		[
+				pytest.param(name, "function", id="name"),
+				pytest.param(call, "function", id="call"),
+				pytest.param(call_scoped, "module", id="call_scoped"),
+				pytest.param(pytest_attribute, "function", id="pytest_attribute"),
+				pytest.param(pytest_call, "function", id="pytest_call"),
+				pytest.param(pytest_call_scoped, "module", id="pytest_call_scoped"),
+				]
+		)
 def test_is_fixture(func, scope):
 	assert is_fixture(func) == (True, scope)
 
 
-def function(): pass
+def function():
+	pass
 
 
 class Class:
 
-	def method(self): pass
+	def method(self):
+		pass
 
 
-def deco(func): return func
-
-@deco
-def decorated(): pass
+def deco(func):
+	return func
 
 
-@pytest.mark.parametrize("func", [
-		pytest.param(function, id="function"),
-		pytest.param(decorated, id="decorated"),
-		pytest.param(Class.method, id="Class.method"),
-		pytest.param(Class().method, id="Class().method"),
-		])
+@deco
+def decorated():
+	pass
+
+
+@pytest.mark.parametrize(
+		"func",
+		[
+				pytest.param(function, id="function"),
+				pytest.param(decorated, id="decorated"),
+				pytest.param(Class.method, id="Class.method"),
+				pytest.param(Class().method, id="Class().method"),
+				]
+		)
 def test_isnt_fixture(func):
 	assert is_fixture(func) == (False, None)