PEP8 fixes on codebase

ci/pep8.py

@@ -39,7 +39,7 @@ def filter_files(files):
         # Check if file is a python file
         if not f.endswith(".py"):
             continue
-        #Check if file is to be excluded
+        # Check if file is to be excluded
         if os.path.basename(f) in EXCLUDE:
             continue
         # Check if file existsw

contrib/migrate.py

@@ -28,7 +28,7 @@ class Migration(object):
     def __init__(self, db):
         self.engine = create_engine(db)
         self.metadata = MetaData(self.engine)
-        #self.engine.echo = True
+        # self.engine.echo = True
         self.conn = self.engine.connect()
 
         options = getattr(settings, 'BACKEND', None)[1]

contrib/snf-pithos-tools/pithos/tools/dispatcher.py

@@ -76,11 +76,11 @@ def main():
         level=logging.DEBUG if DEBUG else logging.INFO)
     logger = logging.getLogger('dispatcher')
 
-    host =  'amqp://%s:%s@%s:%s' % (opts.user, opts.password, opts.host, opts.port)
+    host = 'amqp://%s:%s@%s:%s' % (opts.user, opts.password, opts.host, opts.port)
     queue = opts.queue
     key = opts.key
     exchange = opts.exchange
-    
+
     client = AMQPClient(hosts=[host])
     client.connect()
 
@@ -89,7 +89,7 @@ def main():
                                 type='topic')
         client.basic_publish(exchange=exchange,
                              routing_key=key,
-                             body= json.dumps({"test": "0123456789"}))
+                             body=json.dumps({"test": "0123456789"}))
         client.close()
         sys.exit()
 

contrib/snf-pithos-tools/pithos/tools/lib/client.py

@@ -85,13 +85,13 @@ def _req(self, method, path, body=None, headers=None, format='text',
         kwargs['headers'].setdefault('content-length', len(body)
                                      if body else 0)
 
-        #print '#', method, full_path, kwargs
-        #t1 = datetime.datetime.utcnow()
+        # print '#', method, full_path, kwargs
+        # t1 = datetime.datetime.utcnow()
         conn.request(method, full_path, **kwargs)
 
         resp = conn.getresponse()
-        #t2 = datetime.datetime.utcnow()
-        #print 'response time:', str(t2-t1)
+        # t2 = datetime.datetime.utcnow()
+        # print 'response time:', str(t2-t1)
         return _handle_response(resp, self.verbose, self.debug)
 
     def _chunked_transfer(self, path, method='PUT', f=stdin, headers=None,
@@ -129,13 +129,13 @@ def _chunked_transfer(self, path, method='PUT', f=stdin, headers=None,
             try:
                 conn.send(data)
             except:
-                #retry
+                # retry
                 conn.send(data)
         data = '0\r\n\r\n'
         try:
             conn.send(data)
         except:
-            #retry
+            # retry
             conn.send(data)
 
         resp = conn.getresponse()
@@ -294,7 +294,7 @@ def list_objects(self, container, format='text',
                        'delimiter': delimiter, 'path': path})
         l = self._list('/%s/%s' % (account, container), format, params,
                        **headers)
-        #TODO support filter trashed with xml also
+        # TODO support filter trashed with xml also
         if format != 'xml' and not include_trashed:
             l = self._filter_trashed(l)
         return l
@@ -995,7 +995,7 @@ def move_object(self, src_container, src_object, dst_container,
                                       **headers)
 
     def list_shared_with_me(self, limit=None, marker=None, format='text',
-            translate=None):
+                            translate=None):
         """lists other accounts that share objects to the user"""
         l = ['limit', 'marker']
         params = {}
@@ -1050,5 +1050,5 @@ def _handle_response(response, verbose=False, debug=False):
     if int(response.status) in ERROR_CODES.keys():
         raise Fault(data, int(response.status))
 
-    #print '**',  response.status, headers, data, '\n'
+    # print '**',  response.status, headers, data, '\n'
     return response.status, headers, data

contrib/snf-pithos-tools/pithos/tools/lib/fuse.py

@@ -210,9 +210,8 @@ class fuse_operations(Structure):
         ('open', CFUNCTYPE(c_int, c_char_p, POINTER(fuse_file_info))),
         ('read', CFUNCTYPE(c_int, c_char_p, POINTER(c_byte), c_size_t, c_off_t,
                            POINTER(fuse_file_info))),
-        (
-            'write', CFUNCTYPE(c_int, c_char_p, POINTER(c_byte), c_size_t, c_off_t,
-            POINTER(fuse_file_info))),
+        ('write', CFUNCTYPE(c_int, c_char_p, POINTER(c_byte), c_size_t, c_off_t,
+                            POINTER(fuse_file_info))),
         ('statfs', CFUNCTYPE(c_int, c_char_p, POINTER(c_statvfs))),
         ('flush', CFUNCTYPE(c_int, c_char_p, POINTER(fuse_file_info))),
         ('release', CFUNCTYPE(c_int, c_char_p, POINTER(fuse_file_info))),
@@ -222,10 +221,9 @@ class fuse_operations(Structure):
         ('listxattr', CFUNCTYPE(c_int, c_char_p, POINTER(c_byte), c_size_t)),
         ('removexattr', CFUNCTYPE(c_int, c_char_p, c_char_p)),
         ('opendir', CFUNCTYPE(c_int, c_char_p, POINTER(fuse_file_info))),
-        (
-            'readdir', CFUNCTYPE(c_int, c_char_p, c_voidp, CFUNCTYPE(c_int, c_voidp,
-            c_char_p, POINTER(
-                c_stat), c_off_t), c_off_t, POINTER(fuse_file_info))),
+        ('readdir', CFUNCTYPE(c_int, c_char_p, c_voidp, CFUNCTYPE(c_int, c_voidp,
+                              c_char_p, POINTER(c_stat), c_off_t), c_off_t,
+                              POINTER(fuse_file_info))),
         ('releasedir', CFUNCTYPE(c_int, c_char_p, POINTER(fuse_file_info))),
         ('fsyncdir', CFUNCTYPE(c_int, c_char_p, c_int, POINTER(
             fuse_file_info))),
@@ -298,7 +296,7 @@ class as is to Operations, instead of just the fh field.
             args.append('-s')
         kwargs.setdefault('fsname', operations.__class__.__name__)
         args.append('-o')
-        args.append(','.join(key if val == True else '%s=%s' % (key, val)
+        args.append(','.join(key if val else '%s=%s' % (key, val)
                              for key, val in kwargs.items()))
         args.append(mountpoint)
         argv = (c_char_p * len(args))(*args)

contrib/snf-pithos-tools/pithos/tools/sh.py

@@ -36,6 +36,7 @@
 
 _cli_commands = {}
 
+
 def cli_command(*args):
     def decorator(cls):
         cls.commands = args
@@ -163,7 +164,7 @@ def list_containers(self):
         print_list(l)
 
     def list_objects(self, container):
-        #prepate params
+        # prepate params
         params = {}
         attrs = ['limit', 'marker', 'prefix', 'delimiter', 'path',
                  'meta', 'if_modified_since', 'if_unmodified_since',
@@ -180,7 +181,7 @@ def list_objects(self, container):
             return
 
         detail = 'json'
-        #if request with meta quering disable trash filtering
+        # if request with meta quering disable trash filtering
         show_trashed = True if self.meta else False
         l = self.client.list_objects(container, **args)
         print_list(l, detail=self.detail)
@@ -395,7 +396,7 @@ def add_options(self, parser):
         parser.add_option('--content-disposition', action='store', type='str',
                           dest='content_disposition', default=None,
                           help='provide the presentation style of the object')
-        #parser.add_option('-S', action='store',
+        # parser.add_option('-S', action='store',
         #                  dest='segment_size', default=False,
         #                  help='use for large file support')
         parser.add_option('--manifest', action='store',
@@ -418,7 +419,7 @@ def execute(self, path, *args):
         if path.find('=') != -1:
             raise Fault('Missing path argument')
 
-        #prepare user defined meta
+        # prepare user defined meta
         meta = {}
         for arg in args:
             key, sep, val = arg.partition('=')
@@ -483,7 +484,7 @@ def execute(self, src, dst, *args):
         src_container, sep, src_object = src.partition('/')
         dst_container, sep, dst_object = dst.partition('/')
 
-        #prepare user defined meta
+        # prepare user defined meta
         meta = {}
         for arg in args:
             key, sep, val = arg.partition('=')
@@ -509,7 +510,7 @@ class SetMeta(Command):
     description = 'set account/container/object metadata'
 
     def execute(self, path, *args):
-        #in case of account fix the args
+        # in case of account fix the args
         if path.find('=') != -1:
             args = list(args)
             args.append(path)
@@ -572,7 +573,7 @@ def execute(self, path, *args):
         if path.find('=') != -1:
             raise Fault('Missing path argument')
 
-        #prepare user defined meta
+        # prepare user defined meta
         meta = {}
         for arg in args:
             key, sep, val = arg.partition('=')
@@ -627,7 +628,7 @@ def execute(self, src, dst, *args):
             dst_container = src_container
             dst_object = dst
 
-        #prepare user defined meta
+        # prepare user defined meta
         meta = {}
         for arg in args:
             key, sep, val = arg.partition('=')
@@ -648,7 +649,7 @@ class UnsetObject(Command):
     description = 'delete metadata info'
 
     def execute(self, path, *args):
-        #in case of account fix the args
+        # in case of account fix the args
         if len(args) == 0:
             args = list(args)
             args.append(path)
@@ -805,7 +806,7 @@ def print_dict(d, header='name', f=stdout, detail=True):
 
 def print_list(l, verbose=False, f=stdout, detail=True):
     for elem in l:
-        #if it's empty string continue
+        # if it's empty string continue
         if not elem:
             continue
         if isinstance(elem, types.DictionaryType):