Skip to content

Commit 8f09d13

Browse files
TsunaMooTsunaMoo
committed
Cleanup
1 parent 54fbab6 commit 8f09d13

13 files changed

Lines changed: 42 additions & 79 deletions

File tree

‎games/game_emuvr.py‎

Lines changed: 2 additions & 5 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 EmuVRModDataChecker(mobase.ModDataChecker):
@@ -112,4 +109,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
112109
modsPath = self.dataDirectory().absolutePath()
113110
if not os.path.exists(modsPath):
114111
os.mkdir(modsPath)
115-
super().initializeProfile(directory, settings)
112+
super().initializeProfile(directory, settings)

‎games/game_ovkwalkingdead.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):
@@ -281,4 +277,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
281277
os.makedirs(self.ue4ssDirectory().absolutePath())
282278
if not self.movieDirectory().exists():
283279
os.makedirs(self.movieDirectory().absolutePath())
284-
super().initializeProfile(directory, settings)
280+
super().initializeProfile(directory, settings)

‎games/game_pacificdrive.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
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
19+
2320

2421

2522
class Content(IntEnum):

‎games/game_payday2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
289289
os.makedirs(self.modsDirectory().absolutePath())
290290
if not self.overridesDirectory().exists():
291291
os.makedirs(self.overridesDirectory().absolutePath())
292-
super().initializeProfile(directory, settings)
292+
super().initializeProfile(directory, settings)

‎games/game_payday3.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):
@@ -281,4 +277,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
281277
os.makedirs(self.ue4ssDirectory().absolutePath())
282278
if not self.movieDirectory().exists():
283279
os.makedirs(self.movieDirectory().absolutePath())
284-
super().initializeProfile(directory, settings)
280+
super().initializeProfile(directory, settings)

‎games/game_titanfall2.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 Content(IntEnum):
@@ -286,4 +283,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
286283
def mappings(self) -> list[mobase.Mapping]:
287284
return [
288285
mobase.Mapping(self._organizer.profilePath() + "/" + self.NorthstarModJson, self.gameDirectory().absolutePath() + "/R2Northstar/" + self.NorthstarModJson, False, False),
289-
]
286+
]

‎games/game_zuma_deluxe.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
from ..basic_game import BasicGame
1212
from ..basic_features import BasicGameSaveGameInfo
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 Content(IntEnum):
@@ -326,4 +323,4 @@ def initializeProfile(self, directory: QDir, settings: mobase.ProfileSetting):
326323
def mappings(self) -> list[mobase.Mapping]:
327324
return [
328325
mobase.Mapping(self._organizer.profilePath() + "/" + self.ProfileLevelsXml, self.gameDirectory().absolutePath() + "/" + self.GameLevelsXml, False, False),
329-
]
326+
]

‎games/unreal_tabs/manage_paks/model.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@
55

66
import mobase
77

8-
try:
9-
from PyQt6.QtCore import (QAbstractItemModel, QByteArray, QDataStream, QDir, QFileInfo, QMimeData, QModelIndex, QObject, Qt, QVariant)
10-
from PyQt6.QtWidgets import QWidget
11-
except:
12-
from PyQt5.QtCore import (QAbstractItemModel, QByteArray, QDataStream, QDir, QFileInfo, QMimeData, QModelIndex, QObject, Qt, QVariant)
13-
from PyQt5.QtWidgets import QWidget
8+
from PyQt6.QtCore import (QAbstractItemModel, QByteArray, QDataStream, QDir, QFileInfo, QMimeData, QModelIndex, QObject, Qt, QVariant)
9+
from PyQt6.QtWidgets import QWidget
1410

1511
_PakInfo: TypeAlias = tuple[str, str, str, str]
1612

@@ -61,12 +57,16 @@ def flags(self, index: QModelIndex) -> Qt.ItemFlag:
6157
| Qt.ItemFlag.ItemIsDropEnabled & Qt.ItemFlag.ItemIsEditable
6258
)
6359

64-
def columnCount(self, parent: QModelIndex = QModelIndex()) -> int:
60+
def columnCount(self, parent: QModelIndex) -> int:
61+
if parent is None:
62+
parent = QModelIndex()
6563
return len(PaksColumns)
6664

6765
def index(
68-
self, row: int, column: int, parent: QModelIndex = QModelIndex()
66+
self, row: int, column: int, parent: QModelIndex
6967
) -> QModelIndex:
68+
if parent is None:
69+
parent = QModelIndex()
7070
if (
7171
row < 0
7272
or row >= self.rowCount()
@@ -86,7 +86,9 @@ def parent(self, child: QModelIndex | None = None) -> QModelIndex | QObject | No
8686
return super().parent()
8787
return QModelIndex()
8888

89-
def rowCount(self, parent: QModelIndex = QModelIndex()) -> int:
89+
def rowCount(self, parent: QModelIndex) -> int:
90+
if parent is None:
91+
parent = QModelIndex()
9092
return len(self.paks)
9193

9294
def setData(

‎games/unreal_tabs/manage_paks/view.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
from typing import Iterable
22

3-
try:
4-
from PyQt6.QtCore import QModelIndex, Qt, pyqtSignal
5-
from PyQt6.QtGui import QDropEvent
6-
from PyQt6.QtWidgets import QAbstractItemView, QTreeView, QWidget
7-
except:
8-
from PyQt5.QtCore import QModelIndex, Qt, pyqtSignal
9-
from PyQt5.QtGui import QDropEvent
10-
from PyQt5.QtWidgets import QAbstractItemView, QTreeView, QWidget
3+
from PyQt6.QtCore import QModelIndex, Qt, pyqtSignal
4+
from PyQt6.QtGui import QDropEvent
5+
from PyQt6.QtWidgets import QAbstractItemView, QTreeView, QWidget
6+
117

128
class PaksView(QTreeView):
139
data_dropped = pyqtSignal()

‎games/unreal_tabs/manage_paks/widget.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
from .model import PaksModel
99
from .view import PaksView
1010

11-
try:
12-
from PyQt6.QtWidgets import QGridLayout, QWidget
13-
from PyQt6.QtCore import QDir, QFileInfo, Qt
14-
except:
15-
from PyQt5.QtWidgets import QGridLayout, QWidget
16-
from PyQt5.QtCore import QDir, QFileInfo, Qt
11+
12+
from PyQt6.QtWidgets import QGridLayout, QWidget
13+
from PyQt6.QtCore import QDir, QFileInfo, Qt
1714

1815
def pak_sort(a: tuple[str, str], b: tuple[str, str]) -> int:
1916
a_pak, a_str = a[0], a[1] or a[0]

0 commit comments

Comments
 (0)