Skip to content

Commit 9f3bf75

Browse files
committed
Consolidate the remaining imports together
1 parent b509918 commit 9f3bf75

File tree

1 file changed

+38
-40
lines changed

1 file changed

+38
-40
lines changed

src/tauon/t_modules/t_main.py

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,44 @@
257257
from pylast import LastFMNetwork
258258
from collections.abc import Callable
259259

260+
# Detect platform
261+
macos = False
262+
msys = False
263+
system = "Linux"
264+
arch = platform.machine()
265+
platform_release = platform.release()
266+
platform_system = platform.system()
267+
win_ver = 0
268+
if platform_system == "Windows":
269+
try:
270+
win_ver = int(platform_release)
271+
except Exception:
272+
logging.exception("Failed getting Windows version from platform.release()")
273+
274+
if sys.platform == "win32":
275+
# system = 'Windows'
276+
system = "Linux"
277+
msys = True
278+
if msys:
279+
import gi
280+
from gi.repository import GLib
281+
else:
282+
import win32con
283+
import win32api
284+
import win32gui
285+
import win32ui
286+
import comtypes
287+
import atexit
288+
else:
289+
system = "Linux"
290+
import fcntl
291+
292+
if sys.platform == "darwin":
293+
macos = True
294+
295+
if system == "Linux" and not macos and not msys:
296+
from tauon.t_modules.t_dbus import Gnome
297+
260298
CONTROL_CHAR_RE = re.compile(r"[\x00-\x08\x0B\x0C\x0E-\x1F]")
261299

262300
class LoadImageAsset:
@@ -38867,46 +38905,6 @@ def menu_is_open() -> bool:
3886738905
return True
3886838906
return False
3886938907

38870-
# BEGIN CODE
38871-
38872-
# Detect platform
38873-
macos = False
38874-
msys = False
38875-
system = "Linux"
38876-
arch = platform.machine()
38877-
platform_release = platform.release()
38878-
platform_system = platform.system()
38879-
win_ver = 0
38880-
if platform_system == "Windows":
38881-
try:
38882-
win_ver = int(platform_release)
38883-
except Exception:
38884-
logging.exception("Failed getting Windows version from platform.release()")
38885-
38886-
if sys.platform == "win32":
38887-
# system = 'Windows'
38888-
system = "Linux"
38889-
msys = True
38890-
if msys:
38891-
import gi
38892-
from gi.repository import GLib
38893-
else:
38894-
import win32con
38895-
import win32api
38896-
import win32gui
38897-
import win32ui
38898-
import comtypes
38899-
import atexit
38900-
else:
38901-
system = "Linux"
38902-
import fcntl
38903-
38904-
if sys.platform == "darwin":
38905-
macos = True
38906-
38907-
if system == "Linux" and not macos and not msys:
38908-
from tauon.t_modules.t_dbus import Gnome
38909-
3891038908
holder = t_bootstrap.holder
3891138909
t_window = holder.t_window
3891238910
renderer = holder.renderer

0 commit comments

Comments
 (0)