Skip to content

Commit 54fbab6

Browse files
TsunaMooTsunaMoo
committed
Removed unused variables and bare excepts.
1 parent d55c23f commit 54fbab6

9 files changed

Lines changed: 31 additions & 62 deletions

‎games/game_cassettebeasts.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99

1010
from ..basic_game import BasicGame
1111

12-
try:
13-
from PyQt6.QtCore import QDir, QFileInfo
14-
except:
15-
from PyQt5.QtCore import QDir, QFileInfo
12+
from PyQt6.QtCore import QDir, QFileInfo
1613

1714

1815
class CassetteBeastsModDataChecker(mobase.ModDataChecker):
@@ -55,7 +52,7 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree:
5552

5653
class CassetteBeastsGame(BasicGame):
5754
appdataenv = os.getenv('APPDATA')
58-
55+
5956
Name = "Cassette Beasts Support Plugin"
6057
Author = "modworkshop"
6158
Version = "1"
@@ -115,4 +112,3 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
115112
if not os.path.exists(modsPath):
116113
os.mkdir(modsPath)
117114
super().initializeProfile(directory, settings)
118-

‎games/game_crimeboss.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414

1515
from ..basic_game import BasicGame
1616

17-
try:
18-
from PyQt6.QtWidgets import QMainWindow, QTabWidget, QWidget
19-
from PyQt6.QtCore import QDir, QFileInfo
20-
except:
21-
from PyQt5.QtWidgets import QMainWindow, QTabWidget, QWidget
22-
from PyQt5.QtCore import QDir, QFileInfo
17+
from PyQt6.QtWidgets import QMainWindow, QTabWidget, QWidget
18+
from PyQt6.QtCore import QDir, QFileInfo
2319

2420

2521
class Content(IntEnum):
@@ -142,6 +138,7 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree:
142138
GameDataUE4SSMods = self.organizer.managedGame().GameDataUE4SSMods + "/"
143139
GameDataPakMods = self.organizer.managedGame().GameDataPakMods + "/"
144140
GameDataNativeMods = self.organizer.managedGame().GameDataNativeMods + "/"
141+
GameDataMovies = self.organizer.managedGame().GameDataMovies + "/"
145142
treefixed = 0
146143
if filetree.exists("UE4SS.dll", mobase.IFileTree.FILE):
147144
treefixed = self.allMoveTo(filetree, os.path.dirname(os.path.dirname(GameDataUE4SSMods)) + "/")
@@ -303,4 +300,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
303300
os.makedirs(self.ue4ssDirectory().absolutePath())
304301
if not self.nativeDirectory().exists():
305302
os.makedirs(self.nativeDirectory().absolutePath())
306-
super().initializeProfile(directory, settings)
303+
super().initializeProfile(directory, settings)

‎games/game_hitman3.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111

1212
from ..basic_game import BasicGame
1313

14-
try:
15-
from PyQt6.QtCore import QDir, QFileInfo
16-
except:
17-
from PyQt5.QtCore import QDir, QFileInfo
14+
from PyQt6.QtCore import QDir, QFileInfo
1815

1916

2017
class Hitman3ModDataChecker(mobase.ModDataChecker):
@@ -117,7 +114,6 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
117114
return True
118115

119116
def update_smm_meta(self, mods: dict[str, mobase.ModState]):
120-
GameSMMPath = self._organizer.managedGame().GameSMMPath
121117
SMM_Path = os.path.join(self.dataDirectory().absolutePath(), self.GameSMMPath)
122118
SMM_Config_Json = SMM_Path + "/config.json"
123119
for key, value in mods.items():
@@ -223,4 +219,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
223219
modsPath = self.dataDirectory().absolutePath()
224220
if not os.path.exists(modsPath):
225221
os.mkdir(modsPath)
226-
super().initializeProfile(directory, settings)
222+
super().initializeProfile(directory, settings)

‎games/game_noita.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111

1212
from ..basic_game import BasicGame
1313

14-
try:
15-
from PyQt6.QtCore import QDir, QFileInfo
16-
except:
17-
from PyQt5.QtCore import QDir, QFileInfo
14+
from PyQt6.QtCore import QDir, QFileInfo
1815

1916

2017
class NoitaModDataChecker(mobase.ModDataChecker):
@@ -151,4 +148,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
151148
modsPath = self.dataDirectory().absolutePath()
152149
if not os.path.exists(modsPath):
153150
os.mkdir(modsPath)
154-
super().initializeProfile(directory, settings)
151+
super().initializeProfile(directory, settings)

‎games/game_payday1.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99

1010
from ..basic_game import BasicGame
1111

12-
try:
13-
from PyQt6.QtCore import QDir, QFileInfo
14-
except:
15-
from PyQt5.QtCore import QDir, QFileInfo
12+
from PyQt6.QtCore import QDir, QFileInfo
1613

1714

1815
class Content(IntEnum):
@@ -219,9 +216,9 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
219216
def dll_copy(
220217
self, mods: dict[str, mobase.ModState]
221218
):
222-
219+
223220
game_path = self.dataDirectory().absolutePath() + "/"
224-
221+
225222
for key, value in mods.items():
226223
key = self._organizer.modList().getMod(key)
227224
tree = key.fileTree()
@@ -274,4 +271,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
274271
modsPath = self.dataDirectory().absolutePath()
275272
if not os.path.exists(modsPath):
276273
os.mkdir(modsPath)
277-
super().initializeProfile(directory, settings)
274+
super().initializeProfile(directory, settings)

‎games/game_payday2.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99

1010
from ..basic_game import BasicGame
1111

12-
try:
13-
from PyQt6.QtCore import QDir, QFileInfo
14-
except:
15-
from PyQt5.QtCore import QDir, QFileInfo
12+
from PyQt6.QtCore import QDir, QFileInfo
1613

1714

1815
class Content(IntEnum):
@@ -145,7 +142,7 @@ def allMoveTo(self, filetree: mobase.IFileTree, toMoveTo: str):
145142

146143
def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree:
147144
treefixed = 0
148-
145+
149146
if filetree.exists("mod.txt", mobase.IFileTree.FILE):
150147
treefixed = self.allMoveTo(filetree, "mods/FOLDERNAME/")
151148
if treefixed == 1:
@@ -233,9 +230,9 @@ def executables(self):
233230
def dll_copy(
234231
self, mods: dict[str, mobase.ModState]
235232
):
236-
233+
237234
game_path = self.dataDirectory().absolutePath() + "/"
238-
235+
239236
for key, value in mods.items():
240237
key = self._organizer.modList().getMod(key)
241238
tree = key.fileTree()

‎games/game_raid2.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99

1010
from ..basic_game import BasicGame
1111

12-
try:
13-
from PyQt6.QtCore import QDir, QFileInfo
14-
except:
15-
from PyQt5.QtCore import QDir, QFileInfo
12+
from PyQt6.QtCore import QDir, QFileInfo
1613

1714

1815
class Content(IntEnum):
@@ -153,9 +150,9 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
153150
def dll_copy(
154151
self, mods: dict[str, mobase.ModState]
155152
):
156-
153+
157154
game_path = self.dataDirectory().absolutePath() + "/"
158-
155+
159156
for key, value in mods.items():
160157
key = self._organizer.modList().getMod(key)
161158
tree = key.fileTree()
@@ -208,4 +205,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
208205
modsPath = self.dataDirectory().absolutePath()
209206
if not os.path.exists(modsPath):
210207
os.mkdir(modsPath)
211-
super().initializeProfile(directory, settings)
208+
super().initializeProfile(directory, settings)

‎games/game_roadtovostok.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,15 @@
88

99
from ..basic_game import BasicGame
1010

11-
try:
12-
from PyQt6.QtCore import QDir, QFileInfo
13-
except:
14-
from PyQt5.QtCore import QDir, QFileInfo
15-
11+
from PyQt6.QtCore import QDir, QFileInfo
1612

1713
class RoadToVostokModDataChecker(mobase.ModDataChecker):
1814
def __init__(self, organizer: mobase.IOrganizer):
1915
super().__init__()
2016
self.organizer: mobase.IOrganizer = organizer
2117

2218
def dataLooksValid(self, filetree: mobase.IFileTree) -> mobase.ModDataChecker.CheckReturn:
23-
19+
2420
if filetree.exists("mods", mobase.IFileTree.DIRECTORY) and not filetree.exists("mod.txt", mobase.IFileTree.FILE):
2521
return mobase.ModDataChecker.VALID
2622
for e in filetree:
@@ -31,7 +27,7 @@ def dataLooksValid(self, filetree: mobase.IFileTree) -> mobase.ModDataChecker.Ch
3127
def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree:
3228
GameModsPath = self.organizer.managedGame().GameModsPath + "/"
3329
treefixed = 0
34-
30+
3531
for branch in filetree:
3632
mod_name = filetree.name()
3733
if mod_name == "":
@@ -41,14 +37,14 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree:
4137
os.makedirs(os.path.join(mod_path, GameModsPath), exist_ok=True)
4238
shutil.move(os.path.join(mod_path, branch.name()), os.path.join(mod_path, GameModsPath, branch.name()))
4339
treefixed = 1
44-
40+
4541
if treefixed == 0:
4642
return None
4743
return filetree
4844

4945

5046
class RoadToVostokGame(BasicGame):
51-
47+
5248
Name = "Road to Vostok Support Plugin"
5349
Author = "modworkshop"
5450
Version = "1"
@@ -86,4 +82,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
8682
modsPath = self.dataDirectory().absolutePath()
8783
if not os.path.exists(modsPath):
8884
os.mkdir(modsPath)
89-
super().initializeProfile(directory, settings)
85+
super().initializeProfile(directory, settings)

‎games/game_silenthill2remake.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414

1515
from ..basic_game import BasicGame
1616

17-
try:
18-
from PyQt6.QtWidgets import QMainWindow, QTabWidget, QWidget
19-
from PyQt6.QtCore import QDir, QFileInfo
20-
except:
21-
from PyQt5.QtWidgets import QMainWindow, QTabWidget, QWidget
22-
from PyQt5.QtCore import QDir, QFileInfo
17+
from PyQt6.QtWidgets import QMainWindow, QTabWidget, QWidget
18+
from PyQt6.QtCore import QDir, QFileInfo
2319

2420

2521
class Content(IntEnum):
@@ -282,4 +278,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
282278
os.makedirs(self.ue4ssDirectory().absolutePath())
283279
if not self.movieDirectory().exists():
284280
os.makedirs(self.movieDirectory().absolutePath())
285-
super().initializeProfile(directory, settings)
281+
super().initializeProfile(directory, settings)

0 commit comments

Comments
 (0)