move most constants and settings out of common

so it becomes lighter to import, and we can then also override more environment variables as they will be queried later

Author: totaam

tests/unittests/unit/client/subsystem/clientmixintest_util.py

@@ -8,8 +8,8 @@
 from time import monotonic
 from collections.abc import Callable
 
-from xpra.common import BACKWARDS_COMPATIBLE, noop
-from xpra.net.common import Packet
+from xpra.common import noop
+from xpra.net.common import Packet, BACKWARDS_COMPATIBLE
 from xpra.util.objects import typedict, AdHocStruct
 from xpra.log import Logger
 from xpra.os_util import gi_import

tests/unittests/unit/platformtests/info_test.py

@@ -28,5 +28,6 @@ def test_all_info(self):
 def main():
     unittest.main()
 
+
 if __name__ == '__main__':
     main()

tests/unittests/unit/server/subsystem/servermixintest_util.py

@@ -8,8 +8,7 @@
 import unittest
 from gi.repository import GLib  # @UnresolvedImport
 
-from xpra.common import BACKWARDS_COMPATIBLE
-from xpra.net.common import Packet
+from xpra.net.common import Packet, BACKWARDS_COMPATIBLE
 from xpra.util.objects import typedict, AdHocStruct
 from xpra.server.source.stub import StubClientConnection
 

tests/unittests/unit/version_util_test.py

@@ -7,7 +7,7 @@
 import unittest
 
 from xpra.os_util import POSIX
-from xpra.common import FULL_INFO
+from xpra.net.common import FULL_INFO
 from xpra.util.version import version_compat_check, get_host_info, get_version_info, get_platform_info
 
 
@@ -37,5 +37,6 @@ def test_get_platform_info(self):
 def main():
     unittest.main()
 
+
 if __name__ == '__main__':
     main()

xpra/audio/common.py

@@ -7,7 +7,7 @@
 from typing import Iterable
 from collections.abc import Sequence
 
-from xpra.common import BACKWARDS_COMPATIBLE
+from xpra.net.common import BACKWARDS_COMPATIBLE
 from xpra.util.str_fn import csv
 from xpra.log import Logger
 

xpra/audio/wrapper.py

@@ -18,7 +18,7 @@
 )
 from xpra.net.subprocess_wrapper import SubprocessCaller, SubprocessCallee, exec_kwargs, exec_env
 from xpra.platform.paths import get_audio_command
-from xpra.common import FULL_INFO
+from xpra.net.common import FULL_INFO
 from xpra.os_util import WIN32, OSX, POSIX, BITS, gi_import
 from xpra.util.parsing import parse_simple_dict
 from xpra.util.objects import typedict

xpra/auth/sys_auth_base.py

@@ -8,7 +8,7 @@
 from typing import Deque
 from collections.abc import Callable, Sequence
 
-from xpra.common import SocketState
+from xpra.net.constants import SocketState
 from xpra.platform.info import get_username
 from xpra.platform.dotxpra import DotXpra
 from xpra.platform.paths import get_socket_dirs

xpra/cairo/backing_base.py

@@ -12,9 +12,9 @@
 from cairo import Context, ImageSurface, Format, Operator, OPERATOR_OVER, LINE_CAP_ROUND
 
 from xpra.client.gui.paint_colors import get_paint_box_color
-from xpra.client.gui.window.backing import WindowBackingBase, fire_paint_callbacks, ALERT_MODE
+from xpra.client.gui.window.backing import WindowBackingBase, fire_paint_callbacks, ALERT_MODE, PaintCallbacks
 from xpra.client.gui.window_border import WindowBorder
-from xpra.common import roundup, PaintCallbacks, noop
+from xpra.common import roundup, noop
 from xpra.util.str_fn import memoryview_to_bytes
 from xpra.util.objects import typedict
 from xpra.util.env import envbool

xpra/client/base/adapter.py

@@ -10,7 +10,6 @@
 from threading import Event
 
 from xpra import __version__
-from xpra.common import FULL_INFO
 from xpra.util.str_fn import Ellipsizer
 from xpra.util.io import is_socket, load_binary_file
 from xpra.util.env import envint, osexpand
@@ -19,7 +18,7 @@
 from xpra.net.connect import connect_to
 from xpra.scripts.parsing import parse_display_name
 from xpra.scripts.config import InitExit, make_defaults_struct
-from xpra.net.common import PacketElement, Packet
+from xpra.net.common import PacketElement, Packet, FULL_INFO
 from xpra.log import Logger
 
 log = Logger("client")

xpra/client/base/challenge.py

@@ -13,7 +13,8 @@
 from xpra.scripts.config import InitExit
 from xpra.net.digest import get_salt, gendigest, get_digests, get_salt_digests
 from xpra.net.common import Packet
-from xpra.common import ConnectionMessage, noop, may_show_progress
+from xpra.common import noop, may_show_progress
+from xpra.net.constants import ConnectionMessage
 from xpra.util.io import use_gui_prompt
 from xpra.util.env import envbool
 from xpra.util.parsing import parse_simple_dict