diff --git a/src/devede_ng.py b/src/devede_ng.py index a43da01..6ed7bd5 100755 --- a/src/devede_ng.py +++ b/src/devede_ng.py @@ -30,7 +30,7 @@ import devedeng.choose_disc_type config_data = devedeng.configuration_data.configuration.get_config() -if config_data == None: +if config_data is None: print ("Can't locate extra files. Aborting.") sys.exit(1) diff --git a/src/devedeng/add_files.py b/src/devedeng/add_files.py index 119f069..fa7c410 100644 --- a/src/devedeng/add_files.py +++ b/src/devedeng/add_files.py @@ -36,7 +36,7 @@ class add_files: builder.connect_signals(self) wadd_files = builder.get_object("add_files") self.wfile_chooser = builder.get_object("filechooserwidget1") - if (add_files.last_path != None): + if (add_files.last_path is not None): self.wfile_chooser.set_current_folder(add_files.last_path) self.wbutton_accept = builder.get_object("button_accept") diff --git a/src/devedeng/ask_subtitles.py b/src/devedeng/ask_subtitles.py index 89d527d..b401158 100644 --- a/src/devedeng/ask_subtitles.py +++ b/src/devedeng/ask_subtitles.py @@ -41,7 +41,7 @@ class ask_subtitles: wencoding = builder.get_object("encoding_l") wlanguage = builder.get_object("language_l") - if (devedeng.add_files.add_files.last_path != None): + if (devedeng.add_files.add_files.last_path is not None): self.wfilename.set_current_folder(devedeng.add_files.add_files.last_path) lang_selection = 0 @@ -114,7 +114,7 @@ class ask_subtitles: def on_subtitle_file_set(self,b): f = self.wfilename.get_filename() - if (f == None) or (f == ""): + if (f is None) or (f == ""): self.waccept.set_sensitive(False) else: - self.waccept.set_sensitive(True) \ No newline at end of file + self.waccept.set_sensitive(True) diff --git a/src/devedeng/avprobe.py b/src/devedeng/avprobe.py index 880fa88..80c716f 100644 --- a/src/devedeng/avprobe.py +++ b/src/devedeng/avprobe.py @@ -126,11 +126,11 @@ class avprobe(devedeng.avbase.avbase): self.original_audiorate_uncompressed = int(float(element["sample_rate"])) self.original_size = str(self.original_width)+"x"+str(self.original_height) - if (self.original_aspect_ratio == None) or (self.original_aspect_ratio <= 1.0): + if (self.original_aspect_ratio is None) or (self.original_aspect_ratio <= 1.0): if (self.original_height != 0): self.original_aspect_ratio = (float(self.original_width))/(float(self.original_height)) - if (self.original_aspect_ratio != None): + if (self.original_aspect_ratio is not None): self.original_aspect_ratio = (float(int(self.original_aspect_ratio*1000.0)))/1000.0 if (len(self.video_list) == 0): diff --git a/src/devedeng/choose_disc_type.py b/src/devedeng/choose_disc_type.py index 9e49db7..3819e47 100644 --- a/src/devedeng/choose_disc_type.py +++ b/src/devedeng/choose_disc_type.py @@ -43,7 +43,7 @@ class choose_disc_type(GObject.GObject): mkv = True analizers, players, converters, menuers, burners, mkiso = self.cv.get_needed_programs() - if (analizers != None) or (converters != None): + if (analizers is not None) or (converters is not None): dvd = False vcd = False cvd = False @@ -51,10 +51,10 @@ class choose_disc_type(GObject.GObject): divx = False mkv = False - if menuers != None: + if menuers is not None: dvd = False - if mkiso != None: + if mkiso is not None: dvd = False if self.check_program(["dvdauthor","--help"]) == False: diff --git a/src/devedeng/configuration_data.py b/src/devedeng/configuration_data.py index 9a0090a..4c3620a 100644 --- a/src/devedeng/configuration_data.py +++ b/src/devedeng/configuration_data.py @@ -28,7 +28,7 @@ class configuration(GObject.GObject): @staticmethod def get_config(): - if configuration.current_configuration == None: + if configuration.current_configuration is None: configuration.current_configuration = configuration() if (configuration.current_configuration.fill_config()): configuration.current_configuration = None @@ -59,14 +59,14 @@ class configuration(GObject.GObject): except: pass - if is_local == None: + if is_local is None: try: os.stat("/usr/local/share/devede_ng/wselect_disk.ui") is_local = True except: pass - if is_local == None: + if is_local is None: return True else: if (is_local): @@ -190,30 +190,30 @@ class configuration(GObject.GObject): config_data.write("pal\n") else: config_data.write("ntsc\n") - if (self.tmp_folder != None): + if (self.tmp_folder is not None): config_data.write("temp_folder:"+str(self.tmp_folder)+"\n") config_data.write("multicore:"+str(self.multicore)+"\n") - if (self.final_folder != None): + if (self.final_folder is not None): config_data.write("final_folder:"+str(self.final_folder)+"\n") - if (self.sub_language != None): + if (self.sub_language is not None): config_data.write("sub_language:"+str(self.sub_language)+"\n") - if (self.sub_codepage != None): + if (self.sub_codepage is not None): config_data.write("sub_codepage:"+str(self.sub_codepage)+"\n") - if (self.film_analizer != None): + if (self.film_analizer is not None): config_data.write("film_analizer:"+str(self.film_analizer)+"\n") - if (self.film_player != None): + if (self.film_player is not None): config_data.write("film_player:"+str(self.film_player)+"\n") - if (self.film_converter != None): + if (self.film_converter is not None): config_data.write("film_converter:"+str(self.film_converter)+"\n") - if (self.menu_converter != None): + if (self.menu_converter is not None): config_data.write("menu_converter:"+str(self.menu_converter)+"\n") - if self.burner != None: + if self.burner is not None: config_data.write("burner:"+str(self.burner)+"\n") - if self.mkiso != None: + if self.mkiso is not None: config_data.write("mkiso:"+str(self.mkiso)+"\n") - if (self.sub_codepage != None): + if (self.sub_codepage is not None): config_data.write("sub_codepage:"+str(self.sub_codepage)+"\n") - if (self.sub_language != None): + if (self.sub_language is not None): config_data.write("sub_language:"+str(self.sub_language)+"\n") config_data.write("subtitle_font_size:"+str(self.subtitles_font_size)+"\n") config_data.write("subtitle_fill_color:"+str(self.subt_fill_color[0])+","+str(self.subt_fill_color[1])+","+str(self.subt_fill_color[2])+"\n") diff --git a/src/devedeng/converter.py b/src/devedeng/converter.py index 6745463..ec1ea09 100644 --- a/src/devedeng/converter.py +++ b/src/devedeng/converter.py @@ -34,7 +34,7 @@ class converter: @staticmethod def get_converter(): - if converter.current_converter == None: + if converter.current_converter is None: converter.current_converter = converter() return converter.current_converter @@ -66,30 +66,30 @@ class converter: name = element.display_name if (element.supports_analize): self.analizers[name] = element - if (self.default_analizer == None): + if (self.default_analizer is None): self.default_analizer = element if (element.supports_play): self.players[name] = element - if (self.default_player == None): + if (self.default_player is None): self.default_player = element if (element.supports_convert): self.converters[name] = element - if (self.default_converter == None): + if (self.default_converter is None): self.default_converter = element for types in element.disc_types: if self.discs.count(types) == 0: self.discs.append(types) if (element.supports_menu): self.menuers[name] = element - if (self.default_menuer == None): + if (self.default_menuer is None): self.default_menuer = element if (element.supports_mkiso): self.mkiso[name] = element - if (self.default_mkiso == None): + if (self.default_mkiso is None): self.default_mkiso = element if (element.supports_burn): self.burners[name] = element - if (self.default_burner == None): + if (self.default_burner is None): self.default_burner = element @@ -151,27 +151,27 @@ class converter: The groups are, in this order: ANALIZERS, PLAYERS, CONVERTERS, MENUERS, BURNERS, MKISO (menuers are the programs that creates the mpeg files for menus) """ - if (self.default_analizer != None): + if (self.default_analizer is not None): analizers = None else: analizers = [] - if (self.default_player != None): + if (self.default_player is not None): players = None else: players = [] - if (self.default_converter != None): + if (self.default_converter is not None): converters = None else: converters = [] - if (self.default_menuer != None): + if (self.default_menuer is not None): menuers = None else: menuers = [] - if (self.default_burner != None): + if (self.default_burner is not None): burners = None else: burners = [] - if (self.default_mkiso != None): + if (self.default_mkiso is not None): mkiso = None else: mkiso = [] @@ -179,17 +179,17 @@ class converter: for element in self.c: e = element() name = e.display_name - if (e.supports_analize) and (analizers != None): + if (e.supports_analize) and (analizers is not None): analizers.append(name) - if (e.supports_play) and (players != None): + if (e.supports_play) and (players is not None): players.append(name) - if (e.supports_convert) and (converters != None): + if (e.supports_convert) and (converters is not None): converters.append(name) - if (e.supports_menu) and (menuers != None): + if (e.supports_menu) and (menuers is not None): menuers.append(name) - if (e.supports_burn) and (burners != None): + if (e.supports_burn) and (burners is not None): burners.append(name) - if (e.supports_mkiso) and (mkiso != None): + if (e.supports_mkiso) and (mkiso is not None): mkiso.append(name) return ( analizers, players, converters, menuers, burners, mkiso ) @@ -197,7 +197,7 @@ class converter: def get_film_player(self): """ returns a class for the desired film player, or the most priviledged if the desired is not installed """ - if (self.config.film_player == None) or (self.config.film_player not in self.players): + if (self.config.film_player is None) or (self.config.film_player not in self.players): return self.default_player else: return self.players[self.config.film_player] @@ -205,7 +205,7 @@ class converter: def get_film_analizer(self): """ returns a class for the desired film analizer, or the most priviledged if the desired is not installed """ - if (self.config.film_analizer == None) or (self.config.film_analizer not in self.analizers): + if (self.config.film_analizer is None) or (self.config.film_analizer not in self.analizers): return self.default_analizer else: return self.analizers[self.config.film_analizer] @@ -213,7 +213,7 @@ class converter: def get_menu_converter(self): """ returns a class for the desired menu converter, or the most priviledged if the desired is not installed """ - if (self.config.menu_converter == None) or (self.config.menu_converter not in self.menuers): + if (self.config.menu_converter is None) or (self.config.menu_converter not in self.menuers): return self.default_menuer else: return self.menuers[self.config.menu_converter] @@ -222,7 +222,7 @@ class converter: """ returns a class for the desired disc converter, or the most priviledged if the desired is not installed """ # if there is a film converter chosen by the user, and it is installed in the system - if (self.config.film_converter != None) and (self.config.film_converter in self.converters): + if (self.config.film_converter is not None) and (self.config.film_converter in self.converters): # and that converter supports the current disc type if self.converters[self.config.film_converter].disc_types.count(self.config.disc_type) != 0: # return that converter @@ -241,7 +241,7 @@ class converter: def get_burner(self): """ returns a class for the desired burner, or the most priviledged if the desired is not installed """ - if (self.config.burner == None) or (self.config.burner not in self.burners): + if (self.config.burner is None) or (self.config.burner not in self.burners): return self.default_burner else: return self.burners[self.config.burner] @@ -249,7 +249,7 @@ class converter: def get_mkiso(self): """ returns a class for the desired mkiso, or the most priviledged if the desired is not installed """ - if (self.config.mkiso == None) or (self.config.mkiso not in self.mkiso): + if (self.config.mkiso is None) or (self.config.mkiso not in self.mkiso): return self.default_mkiso else: return self.mkiso[self.config.mkiso] diff --git a/src/devedeng/create_disk_window.py b/src/devedeng/create_disk_window.py index 508c136..460e5ed 100644 --- a/src/devedeng/create_disk_window.py +++ b/src/devedeng/create_disk_window.py @@ -63,7 +63,7 @@ class create_disk_window: path = self.wpath.get_filename() name = self.wname.get_text() - if ((path == None) or (path == "") or (name == None) or (name == "")): + if ((path is None) or (path == "") or (name is None) or (name == "")): self.waccept.set_sensitive(False) else: self.waccept.set_sensitive(True) diff --git a/src/devedeng/dvd_menu.py b/src/devedeng/dvd_menu.py index d2ae2ae..3372808 100644 --- a/src/devedeng/dvd_menu.py +++ b/src/devedeng/dvd_menu.py @@ -254,7 +254,7 @@ class dvd_menu(devedeng.interface_manager.interface_manager): def write_text(self,text,text_type,xl,xr,y,alignment): """ Renders a line of text, in the rectangle delimited by xl,y-h;xr,y+h, with the specified alignment """ - if text == None: + if text is None: return if text_type == "title": @@ -298,7 +298,7 @@ class dvd_menu(devedeng.interface_manager.interface_manager): elif alignment == "center": x = ((xl + xr) / 2.0) - (extents[2] / 2.0) - if (bgcolor != None): + if (bgcolor is not None): self.cr.move_to(x+extents[0]+2,y-(extents[3]/2.0)-extents[1]+2) self.cr.set_source_rgba(bgcolor[0],bgcolor[1],bgcolor[2],bgcolor[3]) self.cr.show_text(text) @@ -339,7 +339,7 @@ class dvd_menu(devedeng.interface_manager.interface_manager): coordinates = [] - if self.sf == None: + if self.sf is None: self.sf=cairo.ImageSurface(cairo.FORMAT_ARGB32,720,int(self.y)) self.cr=cairo.Context(self.sf) @@ -392,7 +392,7 @@ class dvd_menu(devedeng.interface_manager.interface_manager): if (page_number >= self.pages) and (page_number > 0): page_number -= 1 - if self.wcurrent_page != None: + if self.wcurrent_page is not None: self.wcurrent_page.set_text(_("Page %(X)d of %(Y)d") % {"X":page_number+1 , "Y":self.pages}) xl = left_margin_p xr = 720.0 - right_margin_p @@ -502,7 +502,7 @@ class dvd_menu(devedeng.interface_manager.interface_manager): """ Callback to repaint the menu preview window when it sends the EXPOSE event """ - if (self.sf == None): + if (self.sf is None): self.paint_menu(True, self.wshow_as_selected.get_active(), False, self.current_shown_page) if (self.current_shown_page >= self.pages): self.current_shown_page = self.pages diff --git a/src/devedeng/dvdauthor_converter.py b/src/devedeng/dvdauthor_converter.py index 8fb06f5..a5a6e70 100644 --- a/src/devedeng/dvdauthor_converter.py +++ b/src/devedeng/dvdauthor_converter.py @@ -54,7 +54,7 @@ class dvdauthor_converter(devedeng.executor.executor): def process_stderr(self,data): - if (data != None) and (data[0] != ""): + if (data is not None) and (data[0] != ""): self.progress_bar[1].set_text(data[0]) return @@ -69,12 +69,12 @@ class dvdauthor_converter(devedeng.executor.executor): except: pass - if (len(file_movies) == 1) and (menu_entries == None): + if (len(file_movies) == 1) and (menu_entries is None): onlyone = True else: onlyone = False - if (menu_entries == None): + if (menu_entries is None): elements_per_menu = 1000 else: elements_per_menu = len(menu_entries[0]["chapters"]) @@ -105,13 +105,13 @@ class dvdauthor_converter(devedeng.executor.executor): xml_file.write('\t\t\n') xml_file.write('\t\t\tg0=100;\n') xml_file.write('\t\t\tg1=') #goto variable - if (menu_entries != None) and (start_with_menu): + if (menu_entries is not None) and (start_with_menu): xml_file.write('0;\n') #show menu else: xml_file.write('100;\n') #auto play xml_file.write('\t\t\tg2=1024;\n') #highlight? xml_file.write('\t\t\tg3=') #play all variable - if play_all_opt and (menu_entries != None) and (start_with_menu): + if play_all_opt and (menu_entries is not None) and (start_with_menu): xml_file.write('1;\n') #auto play all else: xml_file.write('0;\n') #do not play all @@ -183,7 +183,7 @@ class dvdauthor_converter(devedeng.executor.executor): title_list.append(counter) counter += 1 - if (menu_entries != None): + if (menu_entries is not None): nmenues = len(menu_entries) button_counter = 0 for menu_page in menu_entries: @@ -223,14 +223,14 @@ class dvdauthor_converter(devedeng.executor.executor): button_counter+=1 xml_file.write('\t\t\t\t\n') - if (menu_page["left"] != None): + if (menu_page["left"] is not None): xml_file.write('\t\t\t\t\n') - if (menu_page["right"] != None): + if (menu_page["right"] is not None): xml_file.write('\t\t\t\t