From 72980c74513f20b7b5f3e42a5bf1c8c50dda17d9 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 24 Dec 2011 00:43:20 +0100 Subject: Revert a stupid idea --- mat-cli | 2 +- mat-gui | 11 ++++++----- mat/mat.py | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/mat-cli b/mat-cli index c18fefb..41ce335 100755 --- a/mat-cli +++ b/mat-cli @@ -149,7 +149,7 @@ def main(): for filename in filenames: class_file = mat.create_class_file(filename, args.backup, args.add2archive) - if class_file is not False: + if class_file is not None: func(class_file, filename, args.force) else: print('Unable to process %s' % filename) diff --git a/mat-gui b/mat-gui index af50e60..66ddf53 100755 --- a/mat-gui +++ b/mat-gui @@ -34,7 +34,7 @@ class CFile(object): try: self.file = mat.create_class_file(filename, backup, add2archive) except: - self.file = False + self.file = None class GUI: @@ -73,7 +73,8 @@ class GUI: self.treeview.set_search_column(1) # filename column is searchable self.treeview.set_rules_hint(True) # alternate colors for rows self.treeview.set_rubber_banding(True) # mouse selection - self.treeview.connect('drag_data_received', self.__on_drag_data_received) + self.treeview.connect('drag_data_received', + self.__on_drag_data_received) self.treeview.drag_dest_set(gtk.DEST_DEFAULT_MOTION | gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_DROP, [('text/uri-list', 0, 80)], gtk.gdk.ACTION_COPY) @@ -191,8 +192,8 @@ data loss, but clean more efficiently')) self.__create_menu_item(_('Clear the filelist'), lambda x: self.liststore.clear(), edit_menu, gtk.STOCK_REMOVE, 'L') - self.__create_menu_item(_('Preferences'), self.__preferences, edit_menu, - gtk.STOCK_PREFERENCES, 'P') + self.__create_menu_item(_('Preferences'), self.__preferences, + edit_menu, gtk.STOCK_PREFERENCES, 'P') process_menu = self.__create_sub_menu(_('Process'), menubar) item = gtk.ImageMenuItem() @@ -295,7 +296,7 @@ data loss, but clean more efficiently')) return False cf = CFile(filename, self.backup, self.add2archive) - if cf.file is not False: # if the file is supported by the mat + if cf.file is not None: # if the file is supported by the mat self.liststore.append([cf, cf.file.basename, cf.file.mime, _('unknow'), 'None']) return False diff --git a/mat/mat.py b/mat/mat.py index 08112ae..0931ac7 100644 --- a/mat/mat.py +++ b/mat/mat.py @@ -108,17 +108,17 @@ def create_class_file(name, backup, add2archive): if not os.path.isfile(name): # check if the file exists logging.error('%s is not a valid file' % name) - return False + return None if not os.access(name, os.R_OK): #check read permissions logging.error('%s is is not readable' % name) - return False + return None if not os.access(name, os.W_OK): #check write permission logging.error('%s is not writtable' % name) - return False + return None filename = '' try: @@ -129,7 +129,7 @@ def create_class_file(name, backup, add2archive): parser = hachoir_parser.createParser(filename) if not parser: logging.info('Unable to parse %s' % filename) - return False + return None mime = parser.mime_type @@ -145,6 +145,6 @@ def create_class_file(name, backup, add2archive): stripper_class = strippers.STRIPPERS[mime] except KeyError: logging.info('Don\'t have stripper for %s format' % mime) - return False + return None return stripper_class(filename, parser, mime, backup, add2archive) -- cgit v1.3