Update hacking version

1. update hacking version to latest
2. fix pep8 failed

Change-Id: Ifc3bfeff4038c93d8c8cf2c9d7814c3003e73504

swiftclient/client.py

@@ -248,8 +248,8 @@ def encode_meta_headers(headers):
         value = encode_utf8(value)
         header = header.lower()
 
-        if (isinstance(header, six.string_types)
-                and header.startswith(USER_METADATA_TYPE)):
+        if (isinstance(header, six.string_types) and
+                header.startswith(USER_METADATA_TYPE)):
             header = encode_utf8(header)
 
         ret[header] = value
@@ -706,9 +706,9 @@ def get_auth(auth_url, user, key, **kwargs):
         if kwargs.get('tenant_name'):
             os_options['tenant_name'] = kwargs['tenant_name']
 
-        if not (os_options.get('tenant_name') or os_options.get('tenant_id')
-                or os_options.get('project_name')
-                or os_options.get('project_id')):
+        if not (os_options.get('tenant_name') or os_options.get('tenant_id') or
+                os_options.get('project_name') or
+                os_options.get('project_id')):
             if auth_version in AUTH_VERSIONS_V2:
                 raise ClientException('No tenant specified')
             raise ClientException('No project name or project id specified.')
@@ -1659,8 +1659,8 @@ def __init__(self, authurl=None, user=None, key=None, retries=5,
         self.force_auth_retry = force_auth_retry
 
     def close(self):
-        if (self.http_conn and isinstance(self.http_conn, tuple)
-                and len(self.http_conn) > 1):
+        if (self.http_conn and isinstance(self.http_conn, tuple) and
+                len(self.http_conn) > 1):
             conn = self.http_conn[1]
             conn.close()
             self.http_conn = None

swiftclient/service.py

@@ -424,8 +424,8 @@ def _check_contents(self):
                                  '{1} != {2}'.format(
                                      self._path, etag, self._expected_md5))
 
-        if (self._content_length is not None
-                and self._actual_read != self._content_length):
+        if (self._content_length is not None and
+                self._actual_read != self._content_length):
             raise SwiftError('Error downloading {0}: read_length != '
                              'content_length, {1:d} != {2:d}'.format(
                                  self._path, self._actual_read,
@@ -1244,8 +1244,8 @@ def _download_object_job(self, conn, container, obj, options):
                 bytes_read = obj_body.bytes_read()
                 if fp is not None:
                     fp.close()
-                    if ('x-object-meta-mtime' in headers and not no_file
-                            and not options['ignore_mtime']):
+                    if ('x-object-meta-mtime' in headers and not no_file and
+                            not options['ignore_mtime']):
                         try:
                             mtime = float(headers['x-object-meta-mtime'])
                         except ValueError:
@@ -2036,8 +2036,8 @@ def _upload_object_job(self, conn, container, source, obj, options,
             new_slo_manifest_paths = set()
             segment_size = int(0 if options['segment_size'] is None
                                else options['segment_size'])
-            if (options['changed'] or options['skip_identical']
-                    or not options['leave_segments']):
+            if (options['changed'] or options['skip_identical'] or
+                    not options['leave_segments']):
                 try:
                     headers = conn.head_object(container, obj)
                     is_slo = config_true_value(
@@ -2058,9 +2058,9 @@ def _upload_object_job(self, conn, container, source, obj, options,
 
                     cl = int(headers.get('content-length'))
                     mt = headers.get('x-object-meta-mtime')
-                    if (path is not None and options['changed']
-                            and cl == getsize(path)
-                            and mt == put_headers['x-object-meta-mtime']):
+                    if (path is not None and options['changed'] and
+                            cl == getsize(path) and
+                            mt == put_headers['x-object-meta-mtime']):
                         res.update({
                             'success': True,
                             'status': 'skipped-changed'
@@ -2095,8 +2095,8 @@ def _upload_object_job(self, conn, container, source, obj, options,
             # a segment job if we're reading from a stream - we may fail if we
             # go over the single object limit, but this gives us a nice way
             # to create objects from memory
-            if (path is not None and segment_size
-                    and (getsize(path) > segment_size)):
+            if (path is not None and segment_size and
+                    (getsize(path) > segment_size)):
                 res['large_object'] = True
                 seg_container = container + '_segments'
                 if options['segment_container']:
@@ -2425,8 +2425,8 @@ def delete(self, container=None, objects=None, options=None):
 
                             # Cancel the remaining container deletes, but yield
                             # any pending results
-                            if (not cancelled and options['fail_fast']
-                                    and not res['success']):
+                            if (not cancelled and options['fail_fast'] and
+                                    not res['success']):
                                 cancelled = True
 
     def _bulk_delete_page_size(self, objects):

swiftclient/shell.py

@@ -1462,8 +1462,9 @@ def st_bash_completion(parser, args, thread_manager, return_parser=False):
             return
     else:
         fn_commands = [fn for fn in globals().keys()
-                       if fn.startswith('st_') and not fn.endswith('_options')
-                       and not fn.endswith('_help')]
+                       if fn.startswith('st_') and
+                       not fn.endswith('_options') and
+                       not fn.endswith('_help')]
 
     subparsers = parser.add_subparsers()
     subcommands = {}

test-requirements.txt

@@ -1,4 +1,4 @@
-hacking<0.11,>=0.10.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 keystoneauth1>=3.4.0  # Apache-2.0

tests/unit/test_shell.py

@@ -1996,8 +1996,8 @@ def _remove_swift_env_vars(self):
         self._environ_vars = {}
         keys = list(os.environ.keys())
         for k in keys:
-            if (k in ('ST_KEY', 'ST_USER', 'ST_AUTH')
-                    or k.startswith('OS_')):
+            if (k in ('ST_KEY', 'ST_USER', 'ST_AUTH') or
+                    k.startswith('OS_')):
                 self._environ_vars[k] = os.environ.pop(k)
 
     def _replace_swift_env_vars(self):
@@ -2979,12 +2979,12 @@ def on_request(method, path, *args, **kwargs):
             Modify response code to 200 if cross account permissions match.
             """
             status = 403
-            if (path.startswith('/v1/%s/%s' % (self.account, self.cont))
-                    and read_ok and method in ('GET', 'HEAD')):
+            if (path.startswith('/v1/%s/%s' % (self.account, self.cont)) and
+                    read_ok and method in ('GET', 'HEAD')):
                 status = 200
             elif (path.startswith('/v1/%s/%s%s'
-                                  % (self.account, self.cont, self.obj))
-                    and write_ok and method in ('PUT', 'POST', 'DELETE')):
+                                  % (self.account, self.cont, self.obj)) and
+                    write_ok and method in ('PUT', 'POST', 'DELETE')):
                 status = 200
             return status
         return on_request

tox.ini

@@ -77,7 +77,7 @@ commands=
 # H403: multi line docstrings should end on a new line
 # H404: multi line docstring should start without a leading new line
 # H405: multi line docstring summary not separated with an empty line
-ignore = H101,H301,H306,H401,H403,H404,H405
+ignore = E731,H101,H301,H306,H401,H403,H404,H405
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg