openstack/swift
Code Issues Proposed changes

Merge "Fix Python 3 issues in utils"

Browse Source
This commit is contained in:
Jenkins 2015-12-01 06:01:45 +00:00 committed by Gerrit Code Review
commit 08f8e235b9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swift/common/utils.py
View File

@ -1312,13 +1312,10 @@ class LogAdapter(logging.LoggerAdapter, object):
_junk, exc, _junk = sys.exc_info()
call = self.error
emsg = ''
if isinstance(exc, OSError):
if isinstance(exc, (OSError, socket.error)):
if exc.errno in (errno.EIO, errno.ENOSPC):
emsg = str(exc)
else:
call = self._exception
elif isinstance(exc, socket.error):
if exc.errno == errno.ECONNREFUSED:
elif exc.errno == errno.ECONNREFUSED:
emsg = _('Connection refused')
elif exc.errno == errno.EHOSTUNREACH:
emsg = _('Host unreachable')
@ -2966,7 +2963,7 @@ class ThreadPool(object):
# multiple instances instantiated. Since the object server uses one
# pool per disk, we have to reimplement this stuff.
_raw_rpipe, self.wpipe = os.pipe()
self.rpipe = greenio.GreenPipe(_raw_rpipe, 'rb', bufsize=0)
self.rpipe = greenio.GreenPipe(_raw_rpipe, 'rb')
for _junk in range(nthreads):
thr = stdlib_threading.Thread(

4
test/unit/common/test_utils.py
View File

@ -1309,6 +1309,7 @@ class TestUtils(unittest.TestCase):
logger.logger.addHandler(handler)
def strip_value(sio):
sio.seek(0)
v = sio.getvalue()
sio.truncate(0)
return v
@ -1402,6 +1403,7 @@ class TestUtils(unittest.TestCase):
logger.logger.addHandler(handler)
def strip_value(sio):
sio.seek(0)
v = sio.getvalue()
sio.truncate(0)
return v
@ -1456,6 +1458,7 @@ class TestUtils(unittest.TestCase):
logger.logger.addHandler(handler)
def strip_value(sio):
sio.seek(0)
v = sio.getvalue()
sio.truncate(0)
return v
@ -2585,6 +2588,7 @@ cluster_dfw1 = http://dfw1.host/v1/
fcntl.LOCK_EX | fcntl.LOCK_NB)
with utils.lock_file(nt.name, unlink=False, append=True) as f:
f.seek(0)
self.assertEqual(f.read(), "test string")
f.seek(0)
f.write("\nanother string")