openstack/deb-python-eventlet
Code Issues Proposed changes

pep8: trivial fixes

Browse Source 
Closes #161 (GH)
This commit is contained in:
Christoph Gysin
2014-11-05 22:31:39 +02:00
committed by Jakub Stasiak
parent 23beb7d43e
commit a70b4ba483
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eventlet/wsgi.py
View File

@@ -473,7 +473,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
tb = traceback.format_exc() tb = traceback.format_exc()
self.server.log_message(tb) self.server.log_message(tb)
if not headers_set: 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", start_response("500 Internal Server Error",
[('Content-type', 'text/plain'), [('Content-type', 'text/plain'),
('Content-length', len(err_body))]) ('Content-length', len(err_body))])

2
tests/greenio_test.py
View File

@@ -104,7 +104,7 @@ class TestGreenSocket(LimitedTestCase):
s.settimeout(0.1) s.settimeout(0.1)
gs = greenio.GreenSocket(s) gs = greenio.GreenSocket(s)
e = gs.connect_ex(('192.0.2.1', 80)) 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) self.assertEqual(e, errno.EAGAIN)
def test_recv_timeout(self): def test_recv_timeout(self):

4
tests/manual/greenio_memtest.py
View File

@@ -21,12 +21,12 @@ def _VmB(VmKey):
t.close() t.close()
except: except:
return 0.0 # non-Linux? 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) i = v.index(VmKey)
v = v[i:].split(None, 3) # whitespace v = v[i:].split(None, 3) # whitespace
if len(v) < 3: if len(v) < 3:
return 0.0 # invalid format? return 0.0 # invalid format?
# convert Vm value to bytes # convert Vm value to bytes
return float(v[1]) * _scale[v[2]] return float(v[1]) * _scale[v[2]]

4
tests/mock.py
View File

@@ -306,7 +306,7 @@ def _set_signature(mock, original, instance=False):
src = """def %s(*args, **kwargs): src = """def %s(*args, **kwargs):
_checksig_(*args, **kwargs) _checksig_(*args, **kwargs)
return mock(*args, **kwargs)""" % name return mock(*args, **kwargs)""" % name
exec (src, context) exec(src, context)
funcopy = context[name] funcopy = context[name]
_setup_func(funcopy, mock) _setup_func(funcopy, mock)
return funcopy return funcopy
@@ -336,7 +336,7 @@ def _setup_func(funcopy, mock):
funcopy.mock_calls = _CallList() funcopy.mock_calls = _CallList()
mock.reset_mock() mock.reset_mock()
ret = funcopy.return_value 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() ret.reset_mock()
funcopy.called = False funcopy.called = False