diff --git a/_pytest/compat.py b/_pytest/compat.py index 4fac998e8..5c364c18f 100644 --- a/_pytest/compat.py +++ b/_pytest/compat.py @@ -10,7 +10,7 @@ import functools import py -import _pytest +import _pytest @@ -112,7 +112,7 @@ def getfuncargnames(function, startindex=None): -if sys.version_info[:2] == (2, 6): +if sys.version_info[:2] == (2, 6): def isclass(object): """ Return true if the object is a class. Overrides inspect.isclass for python 2.6 because it will return True for objects which always return diff --git a/testing/test_conftest.py b/testing/test_conftest.py index e7034179f..bbb5bd496 100644 --- a/testing/test_conftest.py +++ b/testing/test_conftest.py @@ -65,7 +65,7 @@ class TestConftestValueAccessGlobal(object): startdir.ensure("xx", dir=True) conftest = ConftestWithSetinitial(startdir) mod, value = conftest._rget_with_confmod("a", startdir) - assert value == 1.5 + assert value == 1.5 path = py.path.local(mod.__file__) assert path.dirpath() == basedir.join("adir", "b") assert path.purebasename.startswith("conftest") @@ -151,10 +151,10 @@ def test_setinitial_conftest_subdirs(testdir, name): conftest = PytestPluginManager() conftest_setinitial(conftest, [sub.dirpath()], confcutdir=testdir.tmpdir) if name not in ('whatever', '.dotdir'): - assert subconftest in conftest._conftestpath2mod + assert subconftest in conftest._conftestpath2mod assert len(conftest._conftestpath2mod) == 1 else: - assert subconftest not in conftest._conftestpath2mod + assert subconftest not in conftest._conftestpath2mod assert len(conftest._conftestpath2mod) == 0 def test_conftest_confcutdir(testdir): diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py index 3e3919a38..104d66083 100644 --- a/testing/test_parseopt.py +++ b/testing/test_parseopt.py @@ -242,7 +242,7 @@ class TestParser(object): action='store_true') parser.parse([]) help = parser.optparser.format_help() - assert '--func-args, --doit foo' in help + assert '--func-args, --doit foo' in help # testing would be more helpful with all help generated def test_drop_short_help1(self, parser, capsys): diff --git a/tox.ini b/tox.ini index aa525b1fd..75d84f28d 100644 --- a/tox.ini +++ b/tox.ini @@ -196,6 +196,6 @@ filterwarnings = ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning [flake8] -ignore = E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731 +ignore = E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731 max-line-length = 120 exclude = _pytest/vendored_packages/pluggy.py