floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed E101 flake8 errors 

indentation contains mixed spaces and tabs
This commit is contained in:
Andras Tim 2017-07-17 01:25:06 +02:00
parent 6af2abdb53
commit 6146ac97d9
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/pytester.py
View File

@ -1032,11 +1032,11 @@ class Testdir:
return child return child
def getdecoded(out): def getdecoded(out):
try: try:
return out.decode("utf-8") return out.decode("utf-8")
except UnicodeDecodeError: except UnicodeDecodeError:
return "INTERNAL not-utf8-decodeable, truncated string:\n%s" % ( return "INTERNAL not-utf8-decodeable, truncated string:\n%s" % (
py.io.saferepr(out),) py.io.saferepr(out),)
class LineComp: class LineComp:

2
_pytest/python.py
View File

@ -151,7 +151,7 @@ def pytest_collect_file(path, parent):
if path.fnmatch(pat): if path.fnmatch(pat):
break break
else: else:
return return
ihook = parent.session.gethookproxy(path) ihook = parent.session.gethookproxy(path)
return ihook.pytest_pycollect_makemodule(path=path, parent=parent) return ihook.pytest_pycollect_makemodule(path=path, parent=parent)

8
testing/test_conftest.py
View File

@ -319,25 +319,25 @@ class TestConftestVisibility(object):
# N.B.: "swc" stands for "subdir with conftest.py" # N.B.: "swc" stands for "subdir with conftest.py"
# "snc" stands for "subdir no [i.e. without] conftest.py" # "snc" stands for "subdir no [i.e. without] conftest.py"
@pytest.mark.parametrize("chdir,testarg,expect_ntests_passed", [ @pytest.mark.parametrize("chdir,testarg,expect_ntests_passed", [
# Effective target: package/.. # Effective target: package/..
("runner", "..", 3), ("runner", "..", 3),
("package", "..", 3), ("package", "..", 3),
("swc", "../..", 3), ("swc", "../..", 3),
("snc", "../..", 3), ("snc", "../..", 3),
# Effective target: package # Effective target: package
("runner", "../package", 3), ("runner", "../package", 3),
("package", ".", 3), ("package", ".", 3),
("swc", "..", 3), ("swc", "..", 3),
("snc", "..", 3), ("snc", "..", 3),
# Effective target: package/swc # Effective target: package/swc
("runner", "../package/swc", 1), ("runner", "../package/swc", 1),
("package", "./swc", 1), ("package", "./swc", 1),
("swc", ".", 1), ("swc", ".", 1),
("snc", "../swc", 1), ("snc", "../swc", 1),
# Effective target: package/snc # Effective target: package/snc
("runner", "../package/snc", 1), ("runner", "../package/snc", 1),
("package", "./snc", 1), ("package", "./snc", 1),
("swc", "../snc", 1), ("swc", "../snc", 1),

2
testing/test_monkeypatch.py
View File

@ -323,6 +323,6 @@ def test_issue1338_name_resolving():
pytest.importorskip('requests') pytest.importorskip('requests')
monkeypatch = MonkeyPatch() monkeypatch = MonkeyPatch()
try: try:
monkeypatch.delattr('requests.sessions.Session.request') monkeypatch.delattr('requests.sessions.Session.request')
finally: finally:
monkeypatch.undo() monkeypatch.undo()

2
tox.ini
View File

@ -196,6 +196,6 @@ filterwarnings =
ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
[flake8] [flake8]
ignore = E101,E111,E113,E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731 ignore = E111,E113,E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731
max-line-length = 120 max-line-length = 120
exclude = _pytest/vendored_packages/pluggy.py exclude = _pytest/vendored_packages/pluggy.py