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

tkinterweb_tkhtml/__init__.py

@@ -1,117 +1,120 @@
 """
-TkinterWeb-Tkhtml v1.1
-This package provides pre-built binaries of a modified version of the Tkhtml3 widget from http://tkhtml.tcl.tk/tkhtml.html, 
+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.
 
-This package can be used to import the Tkhtml widget into Tkinter projects
+If you are not using the compile script's --install option, to add a new Tkhtml version, use the following file naming conventions:
+- For Tcl/Tk 8:
+  - For a standard release: libTkhtml[major_version.minor_version].[dll/dylib/so] (eg. libTkhtml3.0.dll)
+  - For an experimental release: libTkhtml[major_version.minor_version]exp.[dll/dylib/so] (eg. libTkhtml3.1exp.dll)
+- For Tcl/Tk 9:
+  - For a standard release: libTkhtml[major_version.minor_version]-TclTk9.[dll/dylib/so] (eg. libTkhtml3.0-TclTk9.dll)
+  - For an experimental release: libTkhtml[major_version.minor_version]exp-TclTk9.[dll/dylib/so] (eg. libTkhtml3.1exp-TclTk9.dll)
+
+This package can be used to load the Tkhtml widget into Tkinter applications.
 but is mainly intended to be used through TkinterWeb, which provides a full Python interface. 
 See https://github.com/Andereoo/TkinterWeb.
 
-Copyright (c) 2025 Andereoo
+Copyright (c) 2025 Andrew Clarke
 """
 
 import os
 
-
-
+from tkinter import TclVersion
 
 __title__ = 'TkinterWeb-Tkhtml'
-__author__ = "Andereoo"
-__copyright__ = "Copyright (c) 2025 Andereoo"
+__author__ = "Andrew Clarke"
+__copyright__ = "Copyright (c) 2025 Andrew Clarke"
 __license__ = "MIT"
-__version__ = '1.1.4'
+__version__ = '2.1.0'
 
-TKHTML_RELEASE = "3.0 (TkinterWeb standard)" # Backwards-compatibility. Not useful or even necessarily true anymore. Will be removed.
 
 TKHTML_ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "tkhtml")
 
+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 =  [[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 =  [[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')"
 
-TKHTML_BINARIES =  [file for file in os.listdir(TKHTML_ROOT_DIR) if "libTkhtml" in file]
-
-# NOTE:
-# File names should be in the format libTkhtml[major].[minor].[so/dll/dylib]
-# Experimental file names should be in the format libTkhtml[major].[minor]exp.[so/dll/dylib]
-
-tkhtml_file = None
-
-help_message = f"To add a new Tkhtml version, drop your binary into the {TKHTML_ROOT_DIR} folder, named using the following conventions:\n\
-- For a standard release: libTkhtml[major_version.minor_version].[dll/dylib.so] (eg. libTkhtml3.0.dll)\n\
-- For an experimental release: libTkhtml[major_version.minor_version]exp.[dll/dylib.so] (eg. libTkhtml3.1exp.dll)"
+HELP_MESSAGE = f"Download https://github.com/Andereoo/TkinterWeb-Tkhtml/tree/3.1-TclTk9 and run 'python compile.py --install' to compile and install Tkhtml. If you think this is a bug, consider filing a bug report."
 
-def get_tkhtml_folder():
-    # Backwards-compatibility. Will be removed.
-    return TKHTML_ROOT_DIR
 
-def get_loaded_tkhtml_version():
-    global tkhtml_file
-    if tkhtml_file:
-        version = os.path.basename(tkhtml_file).replace("libTkhtml", "")
-        return version[:version.rfind(".")]
-    else:
-        return None
-    
 def get_tkhtml_file(version=None, index=-1, experimental=False):
     "Get the location of the platform's Tkhtml binary"
+    if not TKHTML_BINARIES:
+        if ALL_TKHTML_BINARIES:
+            raise OSError(f"No Tkhtml versions could be found for Tcl/Tk {int(TclVersion)}. {HELP_MESSAGE}")
+        else:
+            raise OSError(f"No Tkhtml versions could be found for your system. {HELP_MESSAGE}")
+    
     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:
                     if not experimental:
-                        raise OSError(f"Tkhtml version {version} is an experimental release but experimental mode is disabled. {help_message}")
+                        raise OSError(f"Tkhtml version {version} is an experimental release but experimental mode is disabled. {HELP_MESSAGE_EXP}")
                     experimental = True
                 else:
                     if experimental == True:
-                        raise OSError(f"Tkhtml version {version} is not an experimental release but experimental mode is enabled. {help_message}")
+                        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
-        raise OSError(f"Tkhtml version {version} either does not exist or is unsupported on your system. {help_message}")
+                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
         if experimental == True:
             files = [k for k in TKHTML_BINARIES if 'exp' in k]
             if not files:
-                raise OSError(f"No experimental Tkhtml versions could be found on your system. {help_message}")
+                raise OSError(f"No experimental Tkhtml versions could be found on your system. {HELP_MESSAGE_EXP}")
         elif not experimental:
             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):
+    """Get the version of the loaded Tkhtml instance.
+    This will raise a TclError if Tkhtml is not loaded.
+    Only call load_tkhtml_file or load_tkhtml if this fails or if you know this will fail."""
+    return master.tk.call("package", "present", "Tkhtml")
 
-def load_tkhtml_file(master, file, force=False):
+
+def load_tkhtml_file(master, file):
     "Load Tkhtml into the current Tcl/Tk instance"
-    global tkhtml_file
-    if (not tkhtml_file) or force:
-        if TKHTML_ROOT_DIR not in os.environ["PATH"].split(os.pathsep):
-            os.environ["PATH"] = os.pathsep.join([
-                TKHTML_ROOT_DIR,
-                os.environ["PATH"]
-            ])
-        master.tk.call("load", file)
-        tkhtml_file = file
-
-
-def load_tkhtml(master, force=False, use_prebuilt=False):
+    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)
+
+
+def load_tkhtml(master):
     "Load Tkhtml into the current Tcl/Tk instance"
-    if use_prebuilt:
-        # Backwards-compatibility. Will likely be removed.
-        file, version, experimental = get_tkhtml_file(None, 0)
-        load_tkhtml_file(master, file, force)
-        return version
-    
-    global tkhtml_file
-    if (not tkhtml_file) or force:
-        master.tk.call("package", "require", "Tkhtml")
-        tkhtml_file = True
-        return master.tk.call("package", "present", "Tkhtml")
+    master.tk.call("package", "require", "Tkhtml")

{tkinterweb_tkhtml-1.1.4.dist-info → tkinterweb_tkhtml-2.1.0.dist-info}/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Andereoo
+Copyright (c) 2025 Andrew Clarke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb-tkhtml
-Version: 1.1.4
+Version: 2.1.0
 Summary: HTML/CSS viewer for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb-Tkhtml
 License: MIT
@@ -18,8 +18,8 @@ License-File: LICENSE.md
 
 # TkinterWeb-Tkhtml
 
-**This package provides pre-built binaries of a modified version of the Tkhtml3 widget from http://tkhtml.tcl.tk, which enables the display of styled HTML and CSS code in Tkinter applications.**
+**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.**
 
-This package can be used to import the Tkhtml widget into Tkinter projects but is mainly intended to be used through TkinterWeb, which provides a full Python interface. 
+This package can be used to load the Tkhtml widget into Tkinter applications but is mainly intended to be used through TkinterWeb, which provides a full Python interface. 
 
 **See https://github.com/Andereoo/TkinterWeb for more information.**

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-1.1.4.dist-info/RECORD

@@ -1,8 +0,0 @@
-tkinterweb_tkhtml/__init__.py,sha256=VK1KKWqtBJnnyGSL3L9vszqCS5VgJqv7Bey9XMXKxfg,4637
-tkinterweb_tkhtml/tkhtml/COPYRIGHT,sha256=DTaLs2-wF2uscyoCSsLB1oOqXwhtLRVZW1EdLa77OMs,1622
-tkinterweb_tkhtml/tkhtml/libTkhtml3.0.so,sha256=7SLetf_4DXwz_iphlIRAvuuDnm6qYcfAdjVnnapfekc,310504
-tkinterweb_tkhtml-1.1.4.dist-info/LICENSE.md,sha256=A4A41a28mznzn27r63D6_15V0UfRNrfIbKrX3sabiX8,1064
-tkinterweb_tkhtml-1.1.4.dist-info/METADATA,sha256=4b3C7XdPCpKT9souv25p13M8QzE8YIFoXxVhqPdFqjI,1077
-tkinterweb_tkhtml-1.1.4.dist-info/WHEEL,sha256=SfWbrUo49UCeTn4ZCaOubJz9Wtdk5gtBke9gOM6rnWs,101
-tkinterweb_tkhtml-1.1.4.dist-info/top_level.txt,sha256=ZsOj9XY_g_0oGsUoDORlQhP0qdbT4X_Ts6yyFWG7i1A,18
-tkinterweb_tkhtml-1.1.4.dist-info/RECORD,,