pep8 fixes

catcli/catcli.py

@@ -23,8 +23,8 @@ from .utils import *
 
 NAME = 'catcli'
 CUR = os.path.dirname(os.path.abspath(__file__))
-CATALOGPATH = NAME+'.catalog'
-GRAPHPATH = '/tmp/'+NAME+'.dot'
+CATALOGPATH = '{}.catalog'.format(NAME)
+GRAPHPATH = '/tmp/{}.dot'.format(NAME)
 SEPARATOR = '/'
 WILD = '*'
 
@@ -83,7 +83,7 @@ def cmd_index(args, noder, catalog, top):
     if subsize:
         noder.rec_size(root)
     stop = datetime.datetime.now()
-    Logger.info('Indexed {} file(s) in {}'.format(cnt, stop-start))
+    Logger.info('Indexed {} file(s) in {}'.format(cnt, stop - start))
     catalog.save(top)
 
 

catcli/decomp.py

@@ -26,8 +26,7 @@ class Decomp:
             'tlz': self._tar,
             'bz2': self._tar,
             'tar.bz2': self._tar,
-            'zip': self._zip
-          }
+            'zip': self._zip}
 
     def get_format(self):
         return list(self.ext.keys())

catcli/logger.py

@@ -35,13 +35,13 @@ class Logger:
             end = ' {}({}){}'.format(Logger.GRAY, attr, Logger.RESET)
         s = '{}{}storage{}:'.format(pre, Logger.UND, Logger.RESET)
         s += ' {}{}{}{}'.format(Logger.PURPLE, name, Logger.RESET, end)
-        sys.stdout.write(s+'\n')
+        sys.stdout.write('{}\n'.format(s))
 
     def file(pre, name, attr):
         ''' print a file node '''
         s = '{}{}'.format(pre, name)
         s += ' {}[{}]{}'.format(Logger.GRAY, attr, Logger.RESET)
-        sys.stdout.write(s+'\n')
+        sys.stdout.write('{}\n'.format(s))
 
     def dir(pre, name, depth='', attr=None):
         ''' print a directory node '''
@@ -54,33 +54,33 @@ class Logger:
             end = ' [{}]'.format(', '.join(end))
         s = '{}{}{}{}'.format(pre, Logger.BLUE, name, Logger.RESET)
         s += '{}{}{}'.format(Logger.GRAY, end, Logger.RESET)
-        sys.stdout.write(s+'\n')
+        sys.stdout.write('{}\n'.format(s))
 
     def arc(pre, name, archive):
         s = '{}{}{}{}'.format(pre, Logger.YELLOW, name, Logger.RESET)
         s += ' {}[archive:{}]{}'.format(Logger.GRAY, archive, Logger.RESET)
-        sys.stdout.write(s+'\n')
+        sys.stdout.write('{}\n'.format(s))
 
     ######################################################################
     # generic output
     ######################################################################
     def out(string):
         ''' to stdout '''
-        sys.stdout.write(string+'\n')
+        sys.stdout.write('{}\n'.format(string))
 
     def log(string):
         ''' to stderr '''
-        sys.stderr.write(string+'\n')
+        sys.stderr.write('{}\n'.format(string))
 
     def info(string):
         ''' to stderr in color '''
         s = '{}{}{}'.format(Logger.MAGENTA, string, Logger.RESET)
-        sys.stderr.write(s+'\n')
+        sys.stderr.write('{}\n'.format(s))
 
     def err(string):
         ''' to stderr in RED '''
         s = '{}{}{}'.format(Logger.RED, string, Logger.RESET)
-        sys.stderr.write(s+'\n')
+        sys.stderr.write('{}\n'.format(s))
 
     def progr(string):
         ''' print progress '''

catcli/noder.py

@@ -208,7 +208,7 @@ class Noder:
                              withstorage=True)
             paths.append(f.relpath)
         if script:
-            tmp = ['${source}/'+x for x in paths]
+            tmp = ['${source}/' + x for x in paths]
             cmd = 'op=file; source=/media/mnt; $op {}'.format(' '.join(tmp))
             Logger.info(cmd)
         return found

catcli/walker.py

@@ -32,7 +32,7 @@ class Walker:
                 sub = os.path.join(root, f)
                 n = f
                 if len(n) > self.MAXLINE:
-                    n = f[:self.MAXLINE]+'...'
+                    n = f[:self.MAXLINE] + '...'
                 Logger.progr('indexing: {:80}'.format(n))
                 self.noder.file_node(os.path.basename(f), sub,
                                      parent, parentpath)