Lazy WCSManager initialization added

Author: Anulap

DisplayCAL/icc_profile.py

@@ -49,6 +49,8 @@ def which(self, executable, paths=None):
 from DisplayCAL.options import test_input_curve_clipping
 from DisplayCAL.util_list import intlist
 
+mscms_present = None
+mscms = None
 
 if sys.platform not in ("darwin", "win32"):
     from DisplayCAL.defaultpaths import xdg_config_dirs, xdg_config_home
@@ -60,28 +62,36 @@ def which(self, executable, paths=None):
     except ImportError:
         xrandr = None
     from DisplayCAL.util_os import dlopen, which
-    mscms = None
+
+    def get_mscms():
+        return mscms
 elif sys.platform == "win32":
     from DisplayCAL import util_win
     from DisplayCAL.mscms import WCSManager
 
     if sys.getwindowsversion() < (6,):
         # WCS only available under Vista and later
-        mscms = None
+        pass
     else:
         from DisplayCAL.win_handles import (
             get_process_handles,
             get_handle_name,
             get_handle_type,
         )
 
-        mscms = WCSManager()
+        mscms_present = True
 
         win_ver = util_win.win_ver()
         win10_1903 = (
             win_ver[0].startswith("Windows 10") and win_ver[2] >= "Version 1903"
         )
 
+        def get_mscms():
+            global mscms
+            if mscms is None:
+                mscms = WCSManager()
+            return mscms
+
 # Gamut volumes in cubic colorspace units (L*a*b*) as reported by Argyll's
 # iccgamut
 GAMUT_VOLUME_SRGB = 833675.435316  # rel. col.
@@ -2028,7 +2038,7 @@ def _ucmm_get_display_profile(display_no, name, path_only=False, use_cache=True)
                 return ICCProfile(profile_path, use_cache=use_cache)
 
 
-if mscms:
+if mscms_present:
     def _wcs_get_display_profile(
         devicekey,
         scope=WCS_PROF_SCOPE.CURRENT_USER,
@@ -2038,7 +2048,7 @@ def _wcs_get_display_profile(
         path_only=False,
         use_cache=True,
     ):
-        prof = mscms.get_default_color_profile(scope, devicekey, profile_type, profile_subtype, profile_id)
+        prof = get_mscms().get_default_color_profile(scope, devicekey, profile_type, profile_subtype, profile_id)
 
         if prof:
             if path_only:
@@ -2173,7 +2183,7 @@ def get_display_profile_windows(
         # EnumDisplayMonitors
         monitors = util_win.get_real_display_devices_info()
         moninfo = monitors[display_no]
-    if not mscms and not devicekey:
+    if not mscms_present and not devicekey:
         # Via GetICMProfile. Sucks royally in a multi-monitor setup
         # where one monitor is disabled, because it'll always get
         # the profile of the first monitor regardless if that is the active
@@ -2210,7 +2220,7 @@ def get_display_profile_windows(
         if device:
             devicekey = device.DeviceKey
     if devicekey:
-        if mscms:
+        if mscms_present:
             # Via WCS
             if util_win.per_user_profiles_isenabled(devicekey=devicekey):
                 scope = WCS_PROF_SCOPE.CURRENT_USER
@@ -2398,13 +2408,13 @@ def set_display_profile(
         if not device:
             return False
         devicekey = device.DeviceKey
-    if mscms:
+    if mscms_present:
         if util_win.per_user_profiles_isenabled(devicekey=devicekey):
             scope = WCS_PROF_SCOPE.CURRENT_USER
         else:
             scope = WCS_PROF_SCOPE.SYSTEM_WIDE
 
-        mscms.associate_color_profile_with_device(scope, profile_name, str(devicekey))
+        get_mscms().associate_color_profile_with_device(scope, profile_name, str(devicekey))
         return True
     else:
         # TODO: Implement for XP
@@ -2421,14 +2431,14 @@ def unset_display_profile(
         if not device:
             return False
         devicekey = device.DeviceKey
-    if mscms:
+    if mscms_present:
         if util_win.per_user_profiles_isenabled(devicekey=devicekey):
             scope = WCS_PROF_SCOPE.CURRENT_USER
         else:
             scope = WCS_PROF_SCOPE.SYSTEM_WIDE
 
-        mscms.disassociate_color_profile_from_device(scope, profile_name, str(devicekey))
-        profiles = mscms.get_device_color_profile_list(scope, str(devicekey))
+        get_mscms().disassociate_color_profile_from_device(scope, profile_name, str(devicekey))
+        profiles = get_mscms().get_device_color_profile_list(scope, str(devicekey))
         if profile_name not in profiles:
             return True
     else:
@@ -2444,13 +2454,13 @@ def set_default_display_profile(
         if not device:
             return False
         devicekey = device.DeviceKey
-    if mscms:
+    if mscms_present:
         if util_win.per_user_profiles_isenabled(devicekey=devicekey):
             scope = WCS_PROF_SCOPE.CURRENT_USER
         else:
             scope = WCS_PROF_SCOPE.SYSTEM_WIDE
 
-        mscms.set_default_color_profile(scope, str(devicekey), profile_name)
+        get_mscms().set_default_color_profile(scope, str(devicekey), profile_name)
         return True
     else:
         # TODO: Implement for XP

DisplayCAL/wxwindows.py

@@ -5289,10 +5289,7 @@ def fancytext_RenderToRenderer(text, renderer, enclose=True):
         p.StartElementHandler = renderer.startElement
         p.EndElementHandler = renderer.endElement
         p.CharacterDataHandler = renderer.characterData
-        print("Before p.parse")
-        print(repr(text))
         p.Parse(text, True)
-        print("After p.parse")
     except xml.parsers.expat.error as err:
         raise ValueError(f'error parsing text text "{text}": {err}') from err