diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-26 01:59:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-26 01:59:47 +0000 |
| commit | 277c16c8b74efc258c02b73ffff1c6d4fb616d0f (patch) | |
| tree | e9c3a5e1ce0d88d533cc3f085db41b98ca45305a /openstackclient | |
| parent | fbc03104f66a80e1d7f3c7880d7db82587a7ab6c (diff) | |
| parent | 3d7a26bdec7b3a41090b6b092025ab5cd8f87b24 (diff) | |
| download | python-openstackclient-277c16c8b74efc258c02b73ffff1c6d4fb616d0f.tar.gz | |
Merge "Defaults are ignored with flake8"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/timing.py | 3 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openstackclient/common/timing.py b/openstackclient/common/timing.py index 5f628759..71c2fec7 100644 --- a/openstackclient/common/timing.py +++ b/openstackclient/common/timing.py @@ -30,7 +30,8 @@ class Timing(command.Lister): for url, td in self.app.timing_data: # NOTE(dtroyer): Take the long way here because total_seconds() # was added in py27. - sec = (td.microseconds + (td.seconds + td.days*86400) * 1e6) / 1e6 + sec = (td.microseconds + (td.seconds + td.days * + 86400) * 1e6) / 1e6 total += sec results.append((url, sec)) results.append(('Total', total)) diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 4cb94822..ca239c51 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -1206,7 +1206,7 @@ class RescueServer(command.ShowOne): _, body = utils.find_resource( compute_client.servers, parsed_args.server, - ).rescue() + ).rescue() return zip(*sorted(six.iteritems(body))) |