parent
df54bf0db5
commit
1ff54ba205
|
@ -86,7 +86,7 @@ class Source(object):
|
||||||
before = Source(before)
|
before = Source(before)
|
||||||
after = Source(after)
|
after = Source(after)
|
||||||
newsource = Source()
|
newsource = Source()
|
||||||
lines = [ (indent + line) for line in self.lines]
|
lines = [(indent + line) for line in self.lines]
|
||||||
newsource.lines = before.lines + lines + after.lines
|
newsource.lines = before.lines + lines + after.lines
|
||||||
return newsource
|
return newsource
|
||||||
|
|
||||||
|
|
|
@ -243,7 +243,7 @@ class TestApprox(object):
|
||||||
|
|
||||||
def test_complex(self):
|
def test_complex(self):
|
||||||
within_1e6 = [
|
within_1e6 = [
|
||||||
( 1.000001 + 1.0j, 1.0 + 1.0j),
|
(1.000001 + 1.0j, 1.0 + 1.0j),
|
||||||
(1.0 + 1.000001j, 1.0 + 1.0j),
|
(1.0 + 1.000001j, 1.0 + 1.0j),
|
||||||
(-1.000001 + 1.0j, -1.0 + 1.0j),
|
(-1.000001 + 1.0j, -1.0 + 1.0j),
|
||||||
(1.0 - 1.000001j, 1.0 - 1.0j),
|
(1.0 - 1.000001j, 1.0 - 1.0j),
|
||||||
|
|
|
@ -141,7 +141,7 @@ class TestMetafunc(object):
|
||||||
|
|
||||||
@pytest.mark.issue510
|
@pytest.mark.issue510
|
||||||
def test_parametrize_empty_list(self):
|
def test_parametrize_empty_list(self):
|
||||||
def func( y): pass
|
def func(y): pass
|
||||||
metafunc = self.Metafunc(func)
|
metafunc = self.Metafunc(func)
|
||||||
metafunc.parametrize("y", [])
|
metafunc.parametrize("y", [])
|
||||||
assert 'skip' in metafunc._calls[0].keywords
|
assert 'skip' in metafunc._calls[0].keywords
|
||||||
|
|
|
@ -52,7 +52,7 @@ class FilesCompleter(object):
|
||||||
if self.directories:
|
if self.directories:
|
||||||
files = _wrapcall(['bash','-c',
|
files = _wrapcall(['bash','-c',
|
||||||
"compgen -A directory -- '{p}'".format(p=prefix)])
|
"compgen -A directory -- '{p}'".format(p=prefix)])
|
||||||
completion += [ f + '/' for f in files]
|
completion += [f + '/' for f in files]
|
||||||
for x in self.allowednames:
|
for x in self.allowednames:
|
||||||
completion += _wrapcall(['bash', '-c',
|
completion += _wrapcall(['bash', '-c',
|
||||||
"compgen -A file -X '!*.{0}' -- '{p}'".format(x,p=prefix)])
|
"compgen -A file -X '!*.{0}' -- '{p}'".format(x,p=prefix)])
|
||||||
|
@ -63,7 +63,7 @@ class FilesCompleter(object):
|
||||||
anticomp = _wrapcall(['bash', '-c',
|
anticomp = _wrapcall(['bash', '-c',
|
||||||
"compgen -A directory -- '{p}'".format(p=prefix)])
|
"compgen -A directory -- '{p}'".format(p=prefix)])
|
||||||
|
|
||||||
completion = list( set(completion) - set(anticomp))
|
completion = list(set(completion) - set(anticomp))
|
||||||
|
|
||||||
if self.directories:
|
if self.directories:
|
||||||
completion += [f + '/' for f in anticomp]
|
completion += [f + '/' for f in anticomp]
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -196,6 +196,6 @@ filterwarnings =
|
||||||
ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
|
ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
ignore = 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 = 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
|
||||||
|
|
Loading…
Reference in New Issue