tkinterweb-tkhtml 1.1.3__tar.gz → 2.0.0__tar.gz

{tkinterweb-tkhtml-1.1.3 → tkinterweb-tkhtml-2.0.0}/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.3 → tkinterweb-tkhtml-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb-tkhtml
-Version: 1.1.3
+Version: 2.0.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.0.0/README.md

@@ -0,0 +1,7 @@
+# TkinterWeb-Tkhtml
+
+**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 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-1.1.3 → tkinterweb-tkhtml-2.0.0}/setup.py

@@ -7,7 +7,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name="tkinterweb-tkhtml",
-    version="1.1.3",
+    version="2.0.0",
     python_requires=">=3.2",
     description="HTML/CSS viewer for Tkinter",
     long_description=README,

tkinterweb-tkhtml-2.0.0/tkinterweb_tkhtml/__init__.py

@@ -0,0 +1,140 @@
+"""
+TkinterWeb-Tkhtml v2.0
+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.
+
+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 Andrew Clarke
+"""
+
+import os
+
+from tkinter import TclVersion
+
+__title__ = 'TkinterWeb-Tkhtml'
+__author__ = "Andrew Clarke"
+__copyright__ = "Copyright (c) 2025 Andrew Clarke"
+__license__ = "MIT"
+__version__ = '2.0.0'
+
+
+# --- Begin universal sdist ---------------------------------------------------
+import sys
+import platform
+
+PLATFORM = platform.uname()
+# --- End universal sdist -----------------------------------------------------
+
+TKHTML_ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "tkhtml")
+
+# --- Begin universal sdist -----------------------------------------------------
+if PLATFORM.system == "Linux":
+    if "arm" in PLATFORM.machine: # 32 bit arm Linux - Raspberry Pi and others
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "linux_armv71")
+    elif "aarch64" in PLATFORM.machine: # 64 bit arm Linux - Raspberry Pi and others
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "manylinux2014_aarch64")
+    elif sys.maxsize > 2**32: # 64 bit Linux
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "manylinux1_x86_64")
+    else: # 32 bit Linux
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "manylinux1_i686")
+elif PLATFORM.system == "Darwin":
+    if "arm" in PLATFORM.machine: # M1 Mac
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "macosx_11_0_arm64")
+    else:  # other Macs
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "macosx_10_6_x86_64")
+else:
+    if sys.maxsize > 2**32: # 64 bit Windows
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "win_amd64")
+    else: # 32 bit Windows
+        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "win32")
+# --- End universal sdist -----------------------------------------------------
+
+ALL_TKHTML_BINARIES =  [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]
+    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]
+    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')"
+
+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_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:
+            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_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_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}")
+    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_EXP}")
+        elif not experimental:
+            files = [k for k in TKHTML_BINARIES if 'exp' not in k]
+        else:
+            files = TKHTML_BINARIES
+        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
+
+
+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):
+    "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"]
+        ])
+    master.tk.call("load", file)
+
+
+def load_tkhtml(master):
+    "Load Tkhtml into the current Tcl/Tk instance"
+    master.tk.call("package", "require", "Tkhtml")

{tkinterweb-tkhtml-1.1.3 → tkinterweb-tkhtml-2.0.0}/tkinterweb_tkhtml.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb-tkhtml
-Version: 1.1.3
+Version: 2.0.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-1.1.3/README.md

@@ -1,7 +0,0 @@
-# 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 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. 
-
-**See https://github.com/Andereoo/TkinterWeb for more information.**

tkinterweb-tkhtml-1.1.3/tkinterweb_tkhtml/__init__.py

@@ -1,142 +0,0 @@
-"""
-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, 
-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. 
-See https://github.com/Andereoo/TkinterWeb.
-
-Copyright (c) 2025 Andereoo
-"""
-
-import os
-
-# Begin universal sdist
-import sys
-import platform
-
-PLATFORM = platform.uname()
-# End universal sdist
-
-
-__title__ = 'TkinterWeb-Tkhtml'
-__author__ = "Andereoo"
-__copyright__ = "Copyright (c) 2025 Andereoo"
-__license__ = "MIT"
-__version__ = '1.1.3'
-
-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")
-
-# Begin universal sdist
-if PLATFORM.system == "Linux":
-    if "arm" in PLATFORM.machine: # 32 bit arm Linux - Raspberry Pi and others
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "linux_armv71")
-    elif "aarch64" in PLATFORM.machine: # 64 bit arm Linux - Raspberry Pi and others
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "manylinux2014_aarch64")
-    elif sys.maxsize > 2**32: # 64 bit Linux
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "manylinux1_x86_64")
-    else: # 32 bit Linux
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "manylinux1_i686")
-elif PLATFORM.system == "Darwin":
-    if "arm" in PLATFORM.machine: # M1 Mac
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "macosx_11_0_arm64")
-    else:  # other Macs
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "macosx_10_6_x86_64")
-else:
-    if sys.maxsize > 2**32: # 64 bit Windows
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "win_amd64")
-    else: # 32 bit Windows
-        TKHTML_ROOT_DIR = os.path.join(TKHTML_ROOT_DIR, "win32")
-# End universal sdist
-
-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)"
-
-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 isinstance(version, float):
-        version = str(version)
-    if version:
-        for 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}")
-                    experimental = True
-                else:
-                    if experimental == True:
-                        raise OSError(f"Tkhtml version {version} is not an experimental release but experimental mode is enabled. {help_message}")
-                    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}")
-    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}")
-        elif not experimental:
-            files = [k for k in TKHTML_BINARIES if 'exp' not in k]
-        else:
-            files = TKHTML_BINARIES
-        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
-
-
-def load_tkhtml_file(master, file, force=False):
-    "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):
-    "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")