STY: Use enumerate, avoid Yoda conditions

Found by flake8-simplify

Author: MartinThoma

src/classes/exporters/edl.py

@@ -92,11 +92,10 @@ def export_edl():
             f.write("FCM: NON-DROP FRAME\n\n")
 
             # Loop through each track
-            edit_index = 1
             export_position = 0.0
 
             # Loop through clips on this track
-            for clip in clips_on_track:
+            for edit_index, clip in enumerate(clips_on_track, start=1):
                 # Do we need a blank clip?
                 if clip.data.get('position', 0.0) > export_position:
                     # Blank clip (i.e. 00:00:00:00)
@@ -165,7 +164,5 @@ def export_edl():
                 export_position = clip.data.get('position') + (clip.data.get('end') - clip.data.get('start'))
                 f.write("\n")
 
-                edit_index += 1
-
             # Update counters
             track_count -= 1

src/classes/info.py

@@ -170,11 +170,8 @@
 
 def website_language():
     """Get the current website language code for URLs"""
-    if CURRENT_LANGUAGE == "zh_CN":
-        return "zh-hans/"
-    elif CURRENT_LANGUAGE == "zh_TW":
-        return "zh-hant/"
-    elif CURRENT_LANGUAGE == "en_US":
-        return ""
-    else:
-        return "%s/" % CURRENT_LANGUAGE.split("_")[0].lower()
+    return {
+        "zh_CN": "zh-hans/",
+        "zh_TW": "zh-hant/",
+        "en_US": ""}.get(CURRENT_LANGUAGE,
+                         "%s/" % CURRENT_LANGUAGE.split("_")[0].lower())

src/windows/export.py

@@ -227,21 +227,15 @@ def __init__(self):
         self.profile_names.sort()
 
         # Loop through sorted profiles
-        box_index = 0
         self.selected_profile_index = 0
-        for profile_name in self.profile_names:
-
+        for box_index, profile_name in enumerate(self.profile_names):
             # Add to dropdown
             self.cboProfile.addItem(self.getProfileName(self.getProfilePath(profile_name)), self.getProfilePath(profile_name))
 
             # Set default (if it matches the project)
             if get_app().project.get(['profile']) in profile_name:
                 self.selected_profile_index = box_index
 
-            # increment item counter
-            box_index += 1
-
-
         # ********* Simple Project Type **********
         # load the simple project type dropdown
         presets = []
@@ -259,14 +253,12 @@ def __init__(self):
                     log.error("Failed to parse file '%s' as a preset: %s" % (preset_path, e))
 
         # Exclude duplicates
-        type_index = 0
         selected_type = 0
         presets = list(set(presets))
-        for item in sorted(presets):
+        for type_index, item in enumerate(sorted(presets)):
             self.cboSimpleProjectType.addItem(item, item)
             if item == _("All Formats"):
                 selected_type = type_index
-            type_index += 1
 
         # Always select 'All Formats' option
         self.cboSimpleProjectType.setCurrentIndex(selected_type)
@@ -559,12 +551,10 @@ def cboSimpleTarget_index_changed(self, widget, index):
 
                                 self.txtAudioCodec.setText(audio_codec_name)
 
-                            layout_index = 0
-                            for layout in self.channel_layout_choices:
+                            for layout_index, layout in enumerate(self.channel_layout_choices):
                                 if layout == int(c[0].childNodes[0].data):
                                     self.cboChannelLayout.setCurrentIndex(layout_index)
                                     break
-                                layout_index += 1
 
                         # Free up DOM memory
                         xmldoc.unlink()
@@ -606,17 +596,13 @@ def cboSimpleVideoProfile_index_changed(self, widget, index):
     def populateAllProfiles(self, selected_profile_path):
         """Populate the full list of profiles"""
         # Look for matching profile in advanced options
-        profile_index = 0
-        for profile_name in self.profile_names:
+        for profile_index, profile_name in enumerate(self.profile_names):
             # Check for matching profile
             if self.getProfilePath(profile_name) == selected_profile_path:
                 # Matched!
                 self.cboProfile.setCurrentIndex(profile_index)
                 break
 
-            # increment index
-            profile_index += 1
-
     def cboSimpleQuality_index_changed(self, widget, index):
         selected_quality = widget.itemData(index)
         log.info(selected_quality)
@@ -797,7 +783,7 @@ def accept(self):
                             "video_bitrate": int(self.convert_to_bytes(self.txtVideoBitRate.text())),
                             "start_frame": self.txtStartFrame.value(),
                             "end_frame": self.txtEndFrame.value(),
-                            "interlace": ((interlacedIndex == 1) or (interlacedIndex == 2)),
+                            "interlace": interlacedIndex in [1, 2],
                             "topfirst": interlacedIndex == 1
                           }
 

src/windows/file_properties.py

@@ -143,24 +143,23 @@ def __init__(self, file):
         self.txtOutput.setText(json.dumps(file.data, sort_keys=True, indent=2))
 
         # Add channel layouts
-        channel_layout_index = 0
         selected_channel_layout_index = 0
         current_channel_layout = 0
         if self.file.data["has_audio"]:
             current_channel_layout = int(self.file.data["channel_layout"])
         self.channel_layout_choices = []
-        for layout in [(0, _("Unknown")),
-                       (openshot.LAYOUT_MONO, _("Mono (1 Channel)")),
-                       (openshot.LAYOUT_STEREO, _("Stereo (2 Channel)")),
-                       (openshot.LAYOUT_SURROUND, _("Surround (3 Channel)")),
-                       (openshot.LAYOUT_5POINT1, _("Surround (5.1 Channel)")),
-                       (openshot.LAYOUT_7POINT1, _("Surround (7.1 Channel)"))]:
+        layouts = [(0, _("Unknown")),
+                   (openshot.LAYOUT_MONO, _("Mono (1 Channel)")),
+                   (openshot.LAYOUT_STEREO, _("Stereo (2 Channel)")),
+                   (openshot.LAYOUT_SURROUND, _("Surround (3 Channel)")),
+                   (openshot.LAYOUT_5POINT1, _("Surround (5.1 Channel)")),
+                   (openshot.LAYOUT_7POINT1, _("Surround (7.1 Channel)"))]
+        for channel_layout_index, layout in enumerate(layouts):
             log.info(layout)
             self.channel_layout_choices.append(layout[0])
             self.cboChannelLayout.addItem(layout[1], layout[0])
             if current_channel_layout == layout[0]:
                 selected_channel_layout_index = channel_layout_index
-            channel_layout_index += 1
 
         # Select matching channel layout
         self.cboChannelLayout.setCurrentIndex(selected_channel_layout_index)

src/windows/models/transition_model.py

@@ -58,7 +58,7 @@ def filterAcceptsRow(self, sourceRow, sourceParent):
             trans_name = self.sourceModel().data(index)  # transition name (i.e. Fade In)
 
             # Return, if regExp match in displayed format.
-            return "common" == group_name and self.filterRegExp().indexIn(trans_name) >= 0
+            return group_name == "common" and self.filterRegExp().indexIn(trans_name) >= 0
 
         # Continue running built-in parent filter logic
         return super(TransitionFilterProxyModel, self).filterAcceptsRow(sourceRow, sourceParent)

src/windows/profile.py

@@ -90,19 +90,14 @@ def __init__(self):
         self.profile_names.sort()
 
         # Loop through sorted profiles
-        box_index = 0
-        for profile_name in self.profile_names:
-
+        for box_index, profile_name in enumerate(self.profile_names):
             # Add to dropdown
             self.cboProfile.addItem(profile_name, self.profile_paths[profile_name])
 
             # Set default (if it matches the project)
             if get_app().project.get(['profile']) in profile_name:
                 self.initial_index = box_index
 
-            # increment item counter
-            box_index += 1
-
         # Connect signals
         self.cboProfile.currentIndexChanged.connect(self.dropdown_index_changed)
         self.cboProfile.activated.connect(self.dropdown_activated)

src/windows/title_editor.py

@@ -522,7 +522,7 @@ def get_ref_color(self, id):
                         return self.get_ref_color(xlink_ref_id)
                     elif ref_node.childNodes:
                         for stop_node in ref_node.childNodes:
-                            if "stop" == stop_node.nodeName:
+                            if stop_node.nodeName == "stop":
                                 # get color from stop
                                 ar = stop_node.attributes["style"].value.split(";")
                                 sc = self.find_in_list(ar, "stop-color:")