Collection Manager: Code cleanup. Task: T69577

4 files changed, 15 insertions, 11 deletions

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index de40b9e1..028752e7 100644
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@ -22,7 +22,7 @@ bl_info = {
     "name": "Collection Manager",
     "description": "Manage collections and their objects",
     "author": "Ryan Inch",
-    "version": (2,4,9),
+    "version": (2,4,10),
     "blender": (2, 80, 0),
     "location": "View3D - Object Mode (Shortcut - M)",
     "warning": '',  # used for warning icon and text in addons panel
diff --git a/object_collection_manager/internals.py b/object_collection_manager/internals.py
index 116eb38c..bd0b24d8 100644
--- a/object_collection_manager/internals.py
+++ b/object_collection_manager/internals.py
@@ -60,6 +60,7 @@ class QCDSlots():
     def contains(self, *, idx=None, name=None):
         if idx:
             return idx in self._slots.keys()
+
         if name:
             return name in self._slots.values()
 
@@ -76,19 +77,19 @@ class QCDSlots():
         self._slots.clear()
         self.overrides.clear()
 
-        for k, v in blend_slots.items():
-            self._slots[k] = v
+        for key, value in blend_slots.items():
+            self._slots[key] = value
 
-        for k, v in blend_overrides.items():
-            self.overrides[k] = v
+        for key, value in blend_overrides.items():
+            self.overrides[key] = value
 
     def length(self):
         return len(self._slots)
 
     def get_idx(self, name, r_value=None):
-        for k, v in self._slots.items():
-            if v == name:
-                return k
+        for idx, slot_name in self._slots.items():
+            if slot_name == name:
+                return idx
 
         return r_value
 
@@ -194,8 +195,8 @@ def update_qcd_slot(self, context):
 
     try:
         int(self.qcd_slot_idx)
-    except:
 
+    except ValueError:
         if self.qcd_slot_idx == "":
             qcd_slots.add_override(self.name)
 
diff --git a/object_collection_manager/qcd_operators.py b/object_collection_manager/qcd_operators.py
index 9bfa2110..98d3b455 100644
--- a/object_collection_manager/qcd_operators.py
+++ b/object_collection_manager/qcd_operators.py
@@ -126,10 +126,12 @@ class MoveToQCDSlot(Operator):
                         collection.objects.unlink(obj)
 
 
+        # update the active object if needed
         if not context.active_object:
             try:
                 context.view_layer.objects.active = active_object
-            except:
+
+            except RuntimeError: # object not in visible slot
                 pass
 
         # update header UI
diff --git a/object_collection_manager/ui.py b/object_collection_manager/ui.py
index 4640c9c2..7928e757 100644
--- a/object_collection_manager/ui.py
+++ b/object_collection_manager/ui.py
@@ -256,7 +256,8 @@ class CollectionManager(Operator):
             active_laycol_name = view_layer.active_layer_collection.name
             active_laycol_row_index = layer_collections[active_laycol_name]["row_index"]
             cm.cm_list_index = active_laycol_row_index
-        except:
+
+        except KeyError: # Master Collection isn't supported
             cm.cm_list_index = -1
 
         # check if in phantom mode and if it's still viable