Move glob import to avoid conflict with another plugin.

AnyOldName3 · May 24, 2018 · 6309df2 · 6309df2
1 parent 66c0af1
commit 6309df2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/OrphanedScriptExtenderSaveDeleter.py b/OrphanedScriptExtenderSaveDeleter.py
@@ -1,7 +1,5 @@
 import sys
 
-from glob import glob
-
 from PyQt5.QtCore import QCoreApplication, qDebug
 from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QMessageBox
@@ -62,6 +60,7 @@ def display(self):
         if self.__organizer.profile().localSavesEnabled():
             gameSavesDirectory = os.path.join(self.__organizer.profile().absolutePath(), "saves")
         count = 0
+        from glob import glob
         for cosave in glob(os.path.join(gameSavesDirectory, "*." + skseSaveExtension)):
             saveName = os.path.splitext(cosave)[0]
             if not os.path.isfile(saveName + "." + gameSaveExtension):

diff --git a/OrphanedScriptExtenderSaveDeleter_en.ts b/OrphanedScriptExtenderSaveDeleter_en.ts
@@ -3,42 +3,42 @@
 <context>
     <name>OrphanedScriptExtenderSaveDeleter</name>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="45"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="43"/>
         <source>Deletes script extender saves which don&apos;t have a corresponding base game save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="42"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="40"/>
         <source>Orphaned Script Extender Save Deleter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="55"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="53"/>
         <source>Before starting deletion...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="55"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="53"/>
         <source>Please double check that you want your orphaned script extender saves deleted. If you proceed, you won&apos;t be able to get them back, even if you find you&apos;ve copied the corresponding base game save somewhere else so still have a copy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="71"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="70"/>
         <source>No orphaned script extender saves found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="71"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="70"/>
         <source>No orphaned script extender co-saves were found, so none were removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="73"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="72"/>
         <source>Orphaned script extender saves removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../OrphanedSESaves-plugin/modorganizer-orphaned_script_extender_save_deleter/OrphanedScriptExtenderSaveDeleter.py" line="73"/>
+        <location filename="OrphanedScriptExtenderSaveDeleter.py" line="72"/>
         <source>{0} orphaned script extender co-save(s) removed successfully.</source>
         <translation type="unfinished"></translation>
     </message>