tkinterweb-tkhtml 2.0.0__py3-none-linux_armv7l.whl → 2.1.0__py3-none-linux_armv7l.whl

tkinterweb_tkhtml/__init__.py

@@ -1,5 +1,5 @@
 """
-TkinterWeb-Tkhtml v2.0
+TkinterWeb-Tkhtml v2.1
 This package provides pre-built binaries of a modified version of the Tkhtml3 widget from https://github.com/Andereoo/TkinterWeb-Tkhtml, 
 which enables the display of styled HTML and CSS code in Tkinter applications.
 
@@ -26,19 +26,28 @@ __title__ = 'TkinterWeb-Tkhtml'
 __author__ = "Andrew Clarke"
 __copyright__ = "Copyright (c) 2025 Andrew Clarke"
 __license__ = "MIT"
-__version__ = '2.0.0'
+__version__ = '2.1.0'
 
 
 TKHTML_ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "tkhtml")
 
-ALL_TKHTML_BINARIES =  [file for file in os.listdir(TKHTML_ROOT_DIR) if "libTkhtml" in file]
+try:
+    from tkinterweb_tkhtml_extras import TKHTML_EXTRAS_ROOT_DIR
+    if TKHTML_EXTRAS_ROOT_DIR == None:
+        ALL_TKHTML_BINARIES =  [[TKHTML_ROOT_DIR, file] for file in os.listdir(TKHTML_ROOT_DIR) if "libTkhtml" in file]
+    else:
+        ALL_TKHTML_BINARIES =  [[TKHTML_ROOT_DIR, file] for file in os.listdir(TKHTML_ROOT_DIR) if "libTkhtml" in file] + \
+                            [[TKHTML_EXTRAS_ROOT_DIR, file] for file in os.listdir(TKHTML_EXTRAS_ROOT_DIR) if "libTkhtml" in file]
+except (ImportError, ModuleNotFoundError,):
+    TKHTML_EXTRAS_ROOT_DIR = None
+    ALL_TKHTML_BINARIES =  [[TKHTML_ROOT_DIR, file] for file in os.listdir(TKHTML_ROOT_DIR) if "libTkhtml" in file]
 
 if TclVersion >= 9:
-    TKHTML_BINARIES =  [file for file in ALL_TKHTML_BINARIES if "TclTk9" in file]
+    TKHTML_BINARIES =  [[loc, file] for loc, file in ALL_TKHTML_BINARIES if "TclTk9" in file]
     HELP_MESSAGE_EXP = f"Download https://github.com/Andereoo/TkinterWeb-Tkhtml/tree/experimental and run 'python compile.py' to compile Tkhtml. \
 Copy the binary into {TKHTML_ROOT_DIR}, adding 'exp-TclTk9' after the filename (eg. 'libTkhtml3.1exp-TclTk9.dll')"
 else:
-    TKHTML_BINARIES =  [file for file in ALL_TKHTML_BINARIES if "TclTk9" not in file]
+    TKHTML_BINARIES =  [[loc, file] for loc, file in ALL_TKHTML_BINARIES if "TclTk9" not in file]
     HELP_MESSAGE_EXP = f"Download https://github.com/Andereoo/TkinterWeb-Tkhtml/tree/experimental and run 'python compile.py' to compile Tkhtml. \
 Copy the binary into {TKHTML_ROOT_DIR}, adding 'exp' after the filename (eg. 'libTkhtml3.1exp.dll')"
 
@@ -56,7 +65,7 @@ def get_tkhtml_file(version=None, index=-1, experimental=False):
     if isinstance(version, float):
         version = str(version)
     if version:
-        for file in TKHTML_BINARIES:
+        for loc, file in TKHTML_BINARIES:
             if version in file:
                 # Note: experimental can be "auto"
                 if "exp" in file:
@@ -67,7 +76,7 @@ def get_tkhtml_file(version=None, index=-1, experimental=False):
                     if experimental == True:
                         raise OSError(f"Tkhtml version {version} is not an experimental release but experimental mode is enabled. {HELP_MESSAGE_EXP}")
                     experimental = False
-                return os.path.join(TKHTML_ROOT_DIR, file), version, experimental
+                return os.path.join(loc, file), version, experimental
         raise OSError(f"Tkhtml version {version} either does not exist or is unsupported on your system. {HELP_MESSAGE}")
     else:
         # Get highest numbered avaliable file if a version is not provided
@@ -79,14 +88,14 @@ def get_tkhtml_file(version=None, index=-1, experimental=False):
             files = [k for k in TKHTML_BINARIES if 'exp' not in k]
         else:
             files = TKHTML_BINARIES
-        file = sorted(files)[index]
+        loc, file = sorted(files)[index]
         if "exp" in file:
             experimental = True
         else:
             experimental = False
         version = file.replace("libTkhtml", "").replace("exp", "")
         version = version[:version.rfind(".")]
-        return os.path.join(TKHTML_ROOT_DIR, file), version, experimental
+        return os.path.join(loc, file), version, experimental
 
 
 def get_loaded_tkhtml_version(master):
@@ -98,11 +107,11 @@ def get_loaded_tkhtml_version(master):
 
 def load_tkhtml_file(master, file):
     "Load Tkhtml into the current Tcl/Tk instance"
-    if TKHTML_ROOT_DIR not in os.environ["PATH"].split(os.pathsep):
-        os.environ["PATH"] = os.pathsep.join([
-            TKHTML_ROOT_DIR,
-            os.environ["PATH"]
-        ])
+    paths = os.environ["PATH"].split(os.pathsep)
+    for path in (TKHTML_ROOT_DIR, TKHTML_EXTRAS_ROOT_DIR):
+        if path and path not in paths:
+            paths.insert(0, path)
+    os.environ["PATH"] = os.pathsep.join(paths)
     master.tk.call("load", file)
 
 

{tkinterweb_tkhtml-2.0.0.dist-info → tkinterweb_tkhtml-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb-tkhtml
-Version: 2.0.0
+Version: 2.1.0
 Summary: HTML/CSS viewer for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb-Tkhtml
 License: MIT

tkinterweb_tkhtml-2.1.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+tkinterweb_tkhtml/__init__.py,sha256=FegmuZXZYVYHIhPPI3UEuP3t9hKUSad9PZMHhzhg5WY,5956
+tkinterweb_tkhtml/tkhtml/COPYRIGHT,sha256=DTaLs2-wF2uscyoCSsLB1oOqXwhtLRVZW1EdLa77OMs,1622
+tkinterweb_tkhtml/tkhtml/libTkhtml3.0.so,sha256=7SLetf_4DXwz_iphlIRAvuuDnm6qYcfAdjVnnapfekc,310504
+tkinterweb_tkhtml-2.1.0.dist-info/LICENSE.md,sha256=-PeosTLMUn2PEQ5Q12HUqYH4n_gjoKVxd107WE7BcMQ,1069
+tkinterweb_tkhtml-2.1.0.dist-info/METADATA,sha256=mHABLscCqrleD4-QDF8m7wbu2S-9-lSJDNU3qj9fChk,1104
+tkinterweb_tkhtml-2.1.0.dist-info/WHEEL,sha256=SfWbrUo49UCeTn4ZCaOubJz9Wtdk5gtBke9gOM6rnWs,101
+tkinterweb_tkhtml-2.1.0.dist-info/top_level.txt,sha256=ZsOj9XY_g_0oGsUoDORlQhP0qdbT4X_Ts6yyFWG7i1A,18
+tkinterweb_tkhtml-2.1.0.dist-info/RECORD,,

tkinterweb_tkhtml-2.0.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-tkinterweb_tkhtml/__init__.py,sha256=5rF4HJECZfAPddakqQVvDiHsyIAVQQHYSAOfJDlr2CQ,5309
-tkinterweb_tkhtml/tkhtml/COPYRIGHT,sha256=DTaLs2-wF2uscyoCSsLB1oOqXwhtLRVZW1EdLa77OMs,1622
-tkinterweb_tkhtml/tkhtml/libTkhtml3.0.so,sha256=7SLetf_4DXwz_iphlIRAvuuDnm6qYcfAdjVnnapfekc,310504
-tkinterweb_tkhtml-2.0.0.dist-info/LICENSE.md,sha256=-PeosTLMUn2PEQ5Q12HUqYH4n_gjoKVxd107WE7BcMQ,1069
-tkinterweb_tkhtml-2.0.0.dist-info/METADATA,sha256=Miq4LD-_2rLQ8wzahNhJt5xnz8qriKQ4FA-90Fkd0qI,1104
-tkinterweb_tkhtml-2.0.0.dist-info/WHEEL,sha256=SfWbrUo49UCeTn4ZCaOubJz9Wtdk5gtBke9gOM6rnWs,101
-tkinterweb_tkhtml-2.0.0.dist-info/top_level.txt,sha256=ZsOj9XY_g_0oGsUoDORlQhP0qdbT4X_Ts6yyFWG7i1A,18
-tkinterweb_tkhtml-2.0.0.dist-info/RECORD,,