Core: move is_linux, _macos, _windows to Utils.py

This commit is contained in:
black-sliver 2022-06-04 18:10:34 +02:00 committed by Fabian Dill
parent 103f9e0b85
commit d9418d5ce1
4 changed files with 8 additions and 9 deletions

View File

@ -15,18 +15,14 @@ import sys
from typing import Iterable, Sequence, Callable, Union, Optional
import subprocess
import itertools
from Utils import is_frozen, user_path, local_path, init_logging
from Utils import is_frozen, user_path, local_path, init_logging, open_filename, messagebox,\
is_windows, is_macos, is_linux
from shutil import which
import shlex
from enum import Enum, auto
import logging
is_linux = sys.platform.startswith('linux')
is_macos = sys.platform == 'darwin'
is_windows = sys.platform in ("win32", "cygwin", "msys")
def open_host_yaml():
file = user_path('host.yaml')
if is_linux:

View File

@ -13,12 +13,12 @@ import logging
import requests
import Utils
from Utils import is_windows
atexit.register(input, "Press enter to exit.")
# 1 or more digits followed by m or g, then optional b
max_heap_re = re.compile(r"^\d+[mMgG][bB]?$")
is_windows = sys.platform in ("win32", "cygwin", "msys")
def prompt_yes_no(prompt):

View File

@ -32,6 +32,10 @@ class Version(typing.NamedTuple):
__version__ = "0.3.2"
version_tuple = tuplize_version(__version__)
is_linux = sys.platform.startswith('linux')
is_macos = sys.platform == 'darwin'
is_windows = sys.platform in ("win32", "cygwin", "msys")
import jellyfish
from yaml import load, load_all, dump, SafeLoader

View File

@ -6,7 +6,7 @@ from pathlib import Path
from hashlib import sha3_512
import base64
import datetime
from Utils import version_tuple
from Utils import version_tuple, is_windows
from collections.abc import Iterable
import typing
import setuptools
@ -39,7 +39,6 @@ else:
arch_folder = "exe.{platform}-{version}".format(platform=sysconfig.get_platform(),
version=sysconfig.get_python_version())
buildfolder = Path("build", arch_folder)
is_windows = sys.platform in ("win32", "cygwin", "msys")
# see Launcher.py on how to add scripts to setup.py