Move several steps closer to python3 compatibility

Signed-off-by: Igor Ch <usrenmae@gmail.com>
This commit is contained in:
Igor Ch 2015-02-28 23:26:20 +02:00
commit f1fc1d7a16
7 changed files with 10 additions and 8 deletions

View file

@ -25,7 +25,7 @@ class Command(DocoptCommand):
def dispatch(self, *args, **kwargs):
try:
super(Command, self).dispatch(*args, **kwargs)
except SSLError, e:
except SSLError as e:
raise errors.UserError('SSL error: %s' % e)
except ConnectionError:
if call_silently(['which', 'docker']) != 0:

View file

@ -46,7 +46,7 @@ class LogPrinter(object):
if monochrome:
color_fn = no_color
else:
color_fn = color_fns.next()
color_fn = next(color_fns)
generators.append(self._make_log_generator(container, color_fn))
return generators