Cleanup and more pylint conformity

8 files changed, 19 insertions, 49 deletions

diff --git a/cli.py b/cli.py
index a540258..7c4c399 100755
--- a/cli.py
+++ b/cli.py
@@ -137,7 +137,7 @@ def main():
         func = is_clean
     elif args.ugly is True:  # destructive anonymisation method
         func = clean_meta_ugly
-    elif args.list is True:
+    elif args.list is True:  # print the list of all supported format
         list_supported()
     else:  # clean the file
         func = clean_meta
diff --git a/gui.py b/gui.py
index c95697b..571db55 100644
--- a/gui.py
+++ b/gui.py
@@ -464,9 +464,9 @@ class TreeViewTooltips(object):
         '''
             as the pointer moves across the view, show a tooltip
         '''
-        path = view.get_path_at_pos(int(event.x), int(event.y))
-        if path:
-            path, col, x, y = path
+        path_at_pos = view.get_path_at_pos(int(event.x), int(event.y))
+        if path_at_pos:
+            path, col, x, y = path_at_pos
             tooltip = self.get_tooltip(view, col, path)
             if tooltip:
                 tooltip = str(tooltip).strip()
diff --git a/lib/archive.py b/lib/archive.py
index ee05d9e..3f16ee4 100644
--- a/lib/archive.py
+++ b/lib/archive.py
@@ -12,6 +12,7 @@ import parser
 import mat
 import tarfile
 
+
 class GenericArchiveStripper(parser.GenericParser):
     '''
         Represent a generic archive
@@ -48,6 +49,7 @@ class GenericArchiveStripper(parser.GenericParser):
         '''
         raise NotImplementedError
 
+
 class ZipStripper(GenericArchiveStripper):
     '''
         Represent a zip file
@@ -231,7 +233,7 @@ class TarStripper(GenericArchiveStripper):
             if item.type is '0':  # is item a regular file ?
                 try:
                     class_file = mat.create_class_file(name,
-                        False, self.add2archive) #no backup file
+                        False, self.add2archive)  # no backup file
                     if not class_file.is_clean():
                         tarin.close()
                         return False
diff --git a/lib/audio.py b/lib/audio.py
index 20cae6a..18daa7e 100644
--- a/lib/audio.py
+++ b/lib/audio.py
@@ -3,7 +3,6 @@
 '''
 try:
     from mutagen.flac import FLAC
-    from mutagen.apev2 import APEv2File
     from mutagen.oggvorbis import OggVorbis
 except ImportError:
     pass
@@ -57,43 +56,6 @@ class OggStripper(parser.GenericParser):
             metadata[key] = value
         return metadata
 
-class Apev2Stripper(parser.GenericParser):
-    '''
-        Represent a Apev2 audio file
-    '''
-    def remove_all(self):
-        '''
-            Remove the "metadata" block from the file
-        '''
-        if self.backup is True:
-            shutil.copy2(self.filename, self.output)
-            self.filename = self.output
-
-        mfile = APEv2File(self.filename)
-        mfile.delete()
-        mfile.save()
-
-    def is_clean(self):
-        '''
-            Check if the "metadata" block is present in the file
-        '''
-        mfile = APEv2File(self.filename)
-        if mfile.tags is None:
-            return True
-        else:
-            return False
-
-    def get_meta(self):
-        '''
-            Return the content of the metadata block if present
-        '''
-        metadata = {}
-        mfile = APEv2File(self.filename)
-        if mfile.tags is not None:
-            for key, value in mfile.tags:
-                metadata[key] = value
-        return metadata
-
 
 class FlacStripper(parser.GenericParser):
     '''
diff --git a/lib/mat.py b/lib/mat.py
index ad66d92..97a71ea 100644
--- a/lib/mat.py
+++ b/lib/mat.py
@@ -43,7 +43,8 @@ try:
     STRIPPERS['application/x-pdf'] = office.PdfStripper
     STRIPPERS['application/pdf'] = office.PdfStripper
 except ImportError:
-    print('Unable to import python-poppler and/or python-cairo: no pdf support')
+    print('Unable to import python-poppler and/or python-cairo: no pdf \
+        support')
 
 try:
     import mutagen
@@ -62,7 +63,7 @@ class XMLParser(xml.sax.handler.ContentHandler):
         self.dict = {}
         self.list = []
         self.content, self.key = '', ''
-        self.between= False
+        self.between = False
 
     def startElement(self, name, attrs):
         '''
@@ -142,7 +143,7 @@ def create_class_file(name, backup, add2archive):
 
     mime = parser.mime_type
 
-    if mime == 'application/zip': # some formats are zipped stuff
+    if mime == 'application/zip':  # some formats are zipped stuff
         mime = mimetypes.guess_type(name)[0]
 
     if mime.startswith('application/vnd.oasis.opendocument'):
diff --git a/lib/misc.py b/lib/misc.py
index acbaed8..963800e 100644
--- a/lib/misc.py
+++ b/lib/misc.py
@@ -1,3 +1,7 @@
+'''
+    Care about misc formats
+'''
+
 import hachoir_core
 import parser
 
diff --git a/lib/office.py b/lib/office.py
index bf50774..9c9d367 100644
--- a/lib/office.py
+++ b/lib/office.py
@@ -134,8 +134,8 @@ class PdfStripper(parser.GenericParser):
                 if self.document.get_property(key) != -1:
                     return False
             elif self.document.get_property(key) is not None and \
-                    self.document.get_property(key) != '':
-                    return False
+                self.document.get_property(key) != '':
+                return False
         return True
 
     def remove_all(self):
@@ -179,7 +179,7 @@ class PdfStripper(parser.GenericParser):
                     metadata[key] = self.document.get_property(key)
             elif self.document.get_property(key) is not None and \
                 self.document.get_property(key) != '':
-                    metadata[key] = self.document.get_property(key)
+                metadata[key] = self.document.get_property(key)
         return metadata
 
 
diff --git a/lib/parser.py b/lib/parser.py
index fd0ed13..e1b8f11 100644
--- a/lib/parser.py
+++ b/lib/parser.py
@@ -16,6 +16,7 @@ NOMETA = ('.bmp', '.rdf', '.txt', '.xml', '.rels')
 #xml : formated text
 #rels : openxml foramted text
 
+
 class GenericParser(object):
     '''
         Parent class of all parsers