Improve Python 3.x compatibility

Mechanical translation of deprecated constructs
to 3.x compatible variants.

Change-Id: I4988d0ac656903e0d0320aaa8361d4eeb774a0f9
This commit is contained in:
Dirk Mueller 2013-04-22 03:42:48 +02:00
parent 8d60abd348
commit 57ca88bb6e
2 changed files with 2 additions and 2 deletions

View File

@ -82,7 +82,7 @@ class _InterProcessLock(object):
# to have a laughable 10 attempts "blocking" mechanism.
self.trylock()
return self
except IOError, e:
except IOError as e:
if e.errno in (errno.EACCES, errno.EAGAIN):
# external locks synchronise things like iptables
# updates - give it some time to prevent busy spinning

View File

@ -72,7 +72,7 @@ class ProcessExecutionErrorTest(utils.BaseTestCase):
the Wielder of Wonder, with world's renown.
""".strip()
err = processutils.ProcessExecutionError(stdout=stdout)
print err.message
print(err.message)
self.assertTrue('people-kings' in err.message)
def test_with_stderr(self):