Improved code

enthought · Nov 17, 2024 · e87b4dc · e87b4dc
1 parent 0838f71
commit e87b4dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/comtypes/client/_code_cache.py b/comtypes/client/_code_cache.py
@@ -51,20 +51,20 @@ def _find_gen_dir():
         pymaj, pymin = sys.version_info[:2]
         if ftype == None:
             # Python script
-            subdir = f"Python\\Python{pymaj:d}{pymin:d}\\comtypes_cache"
+            subdir = rf"Python\\Python{pymaj:d}{pymin:d}\\comtypes_cache"
             basedir = _get_appdata_dir()
 
         elif ftype == "dll":
             # dll created with py2exe
             path = _get_module_filename(sys.frozendllhandle)
             base = os.path.splitext(os.path.basename(path))[0]
-            subdir = f"comtypes_cache\\{base}-{pymaj:d}{pymin:d}"
+            subdir = rf"comtypes_cache\\{base}-{pymaj:d}{pymin:d}"
             basedir = tempfile.gettempdir()
 
         else:  # ftype in ('windows_exe', 'console_exe')
             # exe created by py2exe
             base = os.path.splitext(os.path.basename(sys.executable))[0]
-            subdir = f"comtypes_cache\\{base}-{pymaj:d}{pymin:d}"
+            subdir = rf"comtypes_cache\\{base}-{pymaj:d}{pymin:d}"
             basedir = tempfile.gettempdir()
 
         gen_dir = os.path.join(basedir, subdir)

diff --git a/comtypes/server/register.py b/comtypes/server/register.py
@@ -324,7 +324,7 @@ def _registry_entries(self, cls):
                     f"{exe} {script}",
                 )
             else:
-                append(HKCR, "CLSID\\%s\\LocalServer32" % reg_clsid, "", f"{exe}")
+                append(HKCR, "CLSID\\%s\\LocalServer32" % reg_clsid, "", "%s" % exe)
 
         # Register InprocServer32 only when run from script or from
         # py2exe dll server, not from py2exe exe server.