Add flake8 and fix errors.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2014-07-15 13:22:16 -07:00 • committed by Daniel Nephin
commit 50a24bc3bf
9 changed files with 24 additions and 13 deletions

View file

@ -8,7 +8,6 @@ import os
import re
import yaml
from ..packages import six
import sys
from ..project import Project
from ..service import ConfigError
@ -19,6 +18,7 @@ from . import errors
log = logging.getLogger(__name__)
class Command(DocoptCommand):
base_dir = '.'

View file

@ -281,13 +281,13 @@ class TopLevelCommand(Command):
try:
num = int(num)
except ValueError:
raise UserError('Number of containers for service "%s" is not a number' % service)
raise UserError('Number of containers for service "%s" is not a '
'number' % service_name)
try:
self.project.get_service(service_name).scale(num)
except CannotBeScaledError:
raise UserError('Service "%s" cannot be scaled because it specifies a port on the host. If multiple containers for this service were created, the port would clash.\n\nRemove the ":" from the port definition in fig.yml so Docker can choose a random port for each container.' % service_name)
def start(self, options):
"""
Start existing containers.
@ -357,5 +357,6 @@ class TopLevelCommand(Command):
print("Gracefully stopping... (press Ctrl+C again to force)")
self.project.stop(service_names=service_names)
def list_containers(containers):
return ", ".join(c.name for c in containers)

View file

@ -65,11 +65,11 @@ def prettydate(d):
elif s < 120:
return '1 minute ago'
elif s < 3600:
return '{0} minutes ago'.format(s/60)
return '{0} minutes ago'.format(s / 60)
elif s < 7200:
return '1 hour ago'
else:
return '{0} hours ago'.format(s/3600)
return '{0} hours ago'.format(s / 3600)
def mkdir(path, permissions=0o700):
@ -103,8 +103,8 @@ def split_buffer(reader, separator):
index = buffered.find(separator)
if index == -1:
break
yield buffered[:index+1]
buffered = buffered[index+1:]
yield buffered[:index + 1]
buffered = buffered[index + 1:]
if len(buffered) > 0:
yield buffered