From a70b4ba4839a6ba94238a474ba1f471d4b878b67 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Wed, 5 Nov 2014 22:31:39 +0200 Subject: [PATCH] pep8: trivial fixes Closes #161 (GH) --- eventlet/wsgi.py | 2 +- tests/greenio_test.py | 2 +- tests/manual/greenio_memtest.py | 4 ++-- tests/mock.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py index 9c329c9..e69d107 100644 --- a/eventlet/wsgi.py +++ b/eventlet/wsgi.py @@ -473,7 +473,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): tb = traceback.format_exc() self.server.log_message(tb) if not headers_set: - err_body =six.b(tb) if self.server.debug else b'' + err_body = six.b(tb) if self.server.debug else b'' start_response("500 Internal Server Error", [('Content-type', 'text/plain'), ('Content-length', len(err_body))]) diff --git a/tests/greenio_test.py b/tests/greenio_test.py index 0c10771..e05a524 100644 --- a/tests/greenio_test.py +++ b/tests/greenio_test.py @@ -104,7 +104,7 @@ class TestGreenSocket(LimitedTestCase): s.settimeout(0.1) gs = greenio.GreenSocket(s) e = gs.connect_ex(('192.0.2.1', 80)) - if not e in (errno.EHOSTUNREACH, errno.ENETUNREACH): + if e not in (errno.EHOSTUNREACH, errno.ENETUNREACH): self.assertEqual(e, errno.EAGAIN) def test_recv_timeout(self): diff --git a/tests/manual/greenio_memtest.py b/tests/manual/greenio_memtest.py index 8be7f99..9117b10 100644 --- a/tests/manual/greenio_memtest.py +++ b/tests/manual/greenio_memtest.py @@ -21,12 +21,12 @@ def _VmB(VmKey): t.close() except: return 0.0 # non-Linux? - # get VmKey line e.g. 'VmRSS: 9999 kB\n ...' + # get VmKey line e.g. 'VmRSS: 9999 kB\n ...' i = v.index(VmKey) v = v[i:].split(None, 3) # whitespace if len(v) < 3: return 0.0 # invalid format? - # convert Vm value to bytes + # convert Vm value to bytes return float(v[1]) * _scale[v[2]] diff --git a/tests/mock.py b/tests/mock.py index a2da1c3..7bb567a 100644 --- a/tests/mock.py +++ b/tests/mock.py @@ -306,7 +306,7 @@ def _set_signature(mock, original, instance=False): src = """def %s(*args, **kwargs): _checksig_(*args, **kwargs) return mock(*args, **kwargs)""" % name - exec (src, context) + exec(src, context) funcopy = context[name] _setup_func(funcopy, mock) return funcopy @@ -336,7 +336,7 @@ def _setup_func(funcopy, mock): funcopy.mock_calls = _CallList() mock.reset_mock() ret = funcopy.return_value - if _is_instance_mock(ret) and not ret is mock: + if _is_instance_mock(ret) and ret is not mock: ret.reset_mock() funcopy.called = False