2 files changed, 11 insertions, 15 deletions

diff --git a/mat b/mat
index 632da4f..af7421d 100755
--- a/mat
+++ b/mat
@@ -6,7 +6,6 @@
 import sys
 import xml.sax
 import optparse
-import os
 
 import hachoir_core
 
@@ -41,11 +40,10 @@ The default behaviour is to clean files given in argument')
     parser.add_option_group(info)
 
     values, arguments = parser.parse_args()
-    if not arguments and values.list is False:
+    if not arguments and not values.list:
         # if no argument and no files are passed,
         # print help and exit
         parser.print_help()
-        sys.exit(0)
     return values, arguments
 
 
@@ -63,12 +61,12 @@ def list_meta(class_file, filename, force):
         Print all the metadata of 'filename' on stdout
     '''
     print('[+] File %s :' % filename)
-    if force is False and class_file.is_clean():
+    if not force and class_file.is_clean():
         print('No harmful metadata found')
     else:
         meta = class_file.get_meta()
         print ('Harmful metadata found:')
-        if meta is not None:
+        if meta:
             for key, value in class_file.get_meta().iteritems():
                 print('\t' + key + ' : ' + str(value))
 
@@ -88,7 +86,7 @@ def clean_meta(class_file, filename, force):
         Clean the file 'filename'
     '''
     print('[+] Cleaning %s' % filename)
-    if force is False and class_file.is_clean():
+    if not force and class_file.is_clean():
         print('%s is already clean' % filename)
     else:
         if class_file.remove_all():
@@ -110,8 +108,6 @@ def list_supported():
 
     for item in handler.list:
         if strippers.STRIPPERS.has_key(item['mimetype'].split(',')[0]):
-            #on display localy supported formats
-            print 'ok'
             print('%s (%s)' % (item['name'], item['extension']))
             print('\tsupport : ' + item['support'])
             print('\tmetadata : ' + item['metadata'])
@@ -128,11 +124,11 @@ def main():
     args, filenames = parse()
 
     #func receive the function correponding to the options given as parameters
-    if args.display is True:  # only print metadatas
+    if args.display:  # only print metadatas
         func = list_meta
-    elif args.check is True:  # only check if the file is clean
+    elif args.check:  # only check if the file is clean
         func = is_clean
-    elif args.list is True:  # print the list of all supported format
+    elif args.list:  # print the list of all supported format
         list_supported()
     else:  # clean the file
         func = clean_meta
@@ -140,7 +136,7 @@ def main():
     for filename in filenames:
         class_file = mat.create_class_file(filename, args.backup,
             args.add2archive)
-        if class_file is not None:
+        if class_file:
             func(class_file, filename, args.force)
         else:
             print('Unable to process %s' % filename)
diff --git a/mat-gui b/mat-gui
index cba5c94..05bde66 100755
--- a/mat-gui
+++ b/mat-gui
@@ -291,7 +291,7 @@ class GUI:
             return False
 
         cf = CFile(filename, self.backup, self.add2archive)
-        if cf.file is not None:  # if the file is supported by the mat
+        if cf.file:  # if the file is supported by the mat
             self.liststore.append([cf, os.path.dirname(cf.file.filename) + os.path.sep,
                 cf.file.basename, cf.file.mime, _('unknow'), 'None'])
             return False
@@ -538,7 +538,7 @@ non-anonymised) file to output archive'))
         '''
         for line in iterator:  # for each file in selection
             self.statusbar.push(0, _('Checking %s...') % self.liststore[line][1])
-            if self.force is True or self.liststore[line][4] != _('Clean'):
+            if self.force or self.liststore[line][4] != _('Clean'):
                 if self.liststore[line][0].file.is_clean():
                     string = _('Clean')
                 else:
@@ -556,7 +556,7 @@ non-anonymised) file to output archive'))
         for line in iterator:  # for each file in selection
             logging.info('Cleaning %s' % self.liststore[line][1])
             self.statusbar.push(0, _('Cleaning %s...') % self.liststore[line][1])
-            if self.force is True or self.liststore[line][4] != _('Clean'):
+            if self.force or self.liststore[line][4] != _('Clean'):
                 if self.liststore[line][0].file.remove_all():
                     self.liststore[line][4] = _('Clean')
                     if self.backup:  # the backup copy state