_MASSIVE_ pep8 revamp

Thank you so much PyCharm

1 files changed, 25 insertions, 26 deletions

diff --git a/mat b/mat
index 18dd456..f66db41 100755
--- a/mat
+++ b/mat
@@ -1,50 +1,48 @@
 #!/usr/bin/env python
-'''
+"""
     Metadata anonymisation toolkit - CLI edition
-'''
+"""
 
 import sys
-import xml.sax
 import argparse
 import os
 
 import hachoir_core
 
 from libmat import mat
-from libmat import strippers
 from libmat import archive
 
 
 def parse():
-    ''' Get, and parse options passed to the program
-    '''
+    """ Get, and parse options passed to the program
+    """
     parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit')
     parser.add_argument('files', nargs='*')
 
     options = parser.add_argument_group('Options')
     options.add_argument('-a', '--add2archive', action='store_true',
-            help='add to output archive non-supported filetypes (Off by default)')
+                         help='add to output archive non-supported filetypes (Off by default)')
     options.add_argument('-b', '--backup', '-b', action='store_true',
-        help='keep a backup copy')
+                         help='keep a backup copy')
     options.add_argument('-L', '--low-pdf-quality', '-L', action='store_true',
-        help='produces a lighter, but lower quality PDF')
+                         help='produces a lighter, but lower quality PDF')
 
     info = parser.add_argument_group('Information')
     info.add_argument('-c', '--check', action='store_true',
-        help='check if a file is free of harmful metadatas')
+                      help='check if a file is free of harmful metadatas')
     info.add_argument('-d', '--display', action='store_true',
-        help='list all the harmful metadata of a file without removing them')
+                      help='list all the harmful metadata of a file without removing them')
     info.add_argument('-l', '--list', action='store_true',
-        help='list all supported fileformats')
+                      help='list all supported fileformats')
     info.add_argument('-v', '--version', action='version',
-            version='MAT %s - Hachoir %s' % (mat.__version__, hachoir_core.__version__))
+                      version='MAT %s - Hachoir %s' % (mat.__version__, hachoir_core.__version__))
 
     return parser.parse_args()
 
 
 def list_meta(class_file, filename, add2archive):
-    ''' Print all the metadata of 'filename' on stdout
-    '''
+    """ Print all the metadata of 'filename' on stdout
+    """
     print('[+] File %s :' % filename)
     if class_file.is_clean():
         print('No harmful metadata found')
@@ -58,7 +56,7 @@ def list_meta(class_file, filename, add2archive):
 
 
 def is_clean(class_file, filename, add2archive):
-    ''' Tell if 'filename' is clean or not '''
+    """ Tell if 'filename' is clean or not """
     if class_file.is_clean():
         print('[+] %s is clean' % filename)
     else:
@@ -67,7 +65,7 @@ def is_clean(class_file, filename, add2archive):
 
 
 def clean_meta(class_file, filename, add2archive):
-    ''' Clean the file 'filename' '''
+    """ Clean the file 'filename' """
     if not class_file.is_writable:
         print('[-] %s is not writable' % filename)
         return 1
@@ -78,8 +76,8 @@ def clean_meta(class_file, filename, add2archive):
         if is_archive and not is_terminal:
             unsupported_list = class_file.list_unsupported()
             if type(unsupported_list) == list and unsupported_list:
-                print('[-] Can not clean: %s.'\
-                'It contains unsupported filetypes:' % filename)
+                print('[-] Can not clean: %s.'
+                      'It contains unsupported filetypes:' % filename)
                 for i in unsupported_list:
                     print('- %s' % i)
                 return 1
@@ -92,7 +90,7 @@ def clean_meta(class_file, filename, add2archive):
 
 
 def list_supported():
-    ''' Print all supported fileformat, and exit '''
+    """ Print all supported fileformat """
     for item in mat.list_supported_formats():
         print('%s (%s)' % (item['name'], item['extension']))
         print('\tsupport: %s' % item['support'])
@@ -100,20 +98,20 @@ def list_supported():
         print('\tmethod: %s' % item['method'])
         print('\tremaining: %s' % item['remaining'])
         print('\n')
-    sys.exit(0)
 
 
 def main():
-    ''' Main function: get args and launch the appropriate function '''
+    """ Main function: get args and launch the appropriate function """
     args = parse()
 
-    #func receives the function corresponding to the options given as parameters
+    # func receives the function corresponding to the options given as parameters
     if args.display:  # only print metadatas
         func = list_meta
     elif args.check:  # only check if the file is clean
         func = is_clean
     elif args.list:  # print the list of all supported format
         list_supported()
+        sys.exit(0)
     else:  # clean the file
         func = clean_meta
 
@@ -125,12 +123,12 @@ def main():
         filename = args.files.pop()
         if os.path.isdir(filename):
             for root, sub, files in os.walk(filename):
-                for file in files:
-                    args.files.append(os.path.join(root, file))
+                for fname in files:
+                    args.files.append(os.path.join(root, fname))
             continue
 
         class_file = mat.create_class_file(filename, args.backup,
-            add2archive=args.add2archive, low_pdf_quality=args.low_pdf_quality)
+                                           add2archive=args.add2archive, low_pdf_quality=args.low_pdf_quality)
         if class_file:
             ret += func(class_file, filename, args.add2archive)
         else:
@@ -138,5 +136,6 @@ def main():
             print('[-] Unable to process %s' % filename)
     sys.exit(ret)
 
+
 if __name__ == '__main__':
     main()