tkinterweb-tkhtml 2.1.0__tar.gz → 2.2.0__tar.gz

{tkinterweb-tkhtml-2.1.0 → tkinterweb-tkhtml-2.2.0}/PKG-INFO

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

{tkinterweb-tkhtml-2.1.0 → tkinterweb-tkhtml-2.2.0}/setup.py

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

{tkinterweb-tkhtml-2.1.0 → tkinterweb-tkhtml-2.2.0}/tkinterweb_tkhtml/__init__.py

@@ -1,5 +1,5 @@
 """
-TkinterWeb-Tkhtml v2.1
+TkinterWeb-Tkhtml v2.2
 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.
 
@@ -8,14 +8,14 @@ If you are not using the compile script's --install option, to add a new Tkhtml
   - 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)
+  - For a standard release: libTkhtml[major_version.minor_version]TclTk9.[dll/dylib/so] (eg. libTkhtml3.0TclTk9.dll)
+  - For an experimental release: libTkhtml[major_version.minor_version]expTclTk9.[dll/dylib/so] (eg. libTkhtml3.1expTclTk9.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
+Copyright (c) 2026 Andrew Clarke
 """
 
 import os
@@ -24,9 +24,9 @@ from tkinter import TclVersion
 
 __title__ = 'TkinterWeb-Tkhtml'
 __author__ = "Andrew Clarke"
-__copyright__ = "Copyright (c) 2025 Andrew Clarke"
+__copyright__ = "Copyright (c) 2026 Andrew Clarke"
 __license__ = "MIT"
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 
 
 # --- Begin universal sdist ---------------------------------------------------
@@ -62,26 +62,29 @@ else:
 
 try:
     from tkinterweb_tkhtml_extras import TKHTML_EXTRAS_ROOT_DIR
+    from tkinterweb_tkhtml_extras import __version__ as TKHTML_EXTRAS_VERSION
     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_VERSION = None
     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')"
+Copy the binary into {TKHTML_ROOT_DIR}, adding 'expTclTk9' after the filename (eg. 'libTkhtml3.1expTclTk9.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')"
 
-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."
+HELP_MESSAGE = f"Download https://github.com/Andereoo/TkinterWeb-Tkhtml and run 'python compile.py --install' to compile and install Tkhtml. If you think this is a bug, consider filing a bug report."
 
+### TODO: distinguish between standard and Cairo-powered builds so that they can be turned on and off. This will also allow me to keep the binary's version more accurate.
 
 def get_tkhtml_file(version=None, index=-1, experimental=False):
     "Get the location of the platform's Tkhtml binary"

{tkinterweb-tkhtml-2.1.0 → tkinterweb-tkhtml-2.2.0}/tkinterweb_tkhtml.egg-info/PKG-INFO

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

{tkinterweb-tkhtml-2.1.0 → tkinterweb-tkhtml-2.2.0}/tkinterweb_tkhtml.egg-info/SOURCES.txt

@@ -10,9 +10,13 @@ tkinterweb_tkhtml.egg-info/top_level.txt
 tkinterweb_tkhtml/tkhtml/COPYRIGHT
 tkinterweb_tkhtml/tkhtml/linux_armv7l/libTkhtml3.0.so
 tkinterweb_tkhtml/tkhtml/macosx_10_6_x86_64/libTkhtml3.0.dylib
+tkinterweb_tkhtml/tkhtml/macosx_10_6_x86_64/libTkhtml3.1TclTk9.dylib
 tkinterweb_tkhtml/tkhtml/macosx_11_0_arm64/libTkhtml3.0.dylib
+tkinterweb_tkhtml/tkhtml/macosx_11_0_arm64/libTkhtml3.1TclTk9.dylib
 tkinterweb_tkhtml/tkhtml/manylinux1_i686/libTkhtml3.0.so
 tkinterweb_tkhtml/tkhtml/manylinux1_x86_64/libTkhtml3.0.so
+tkinterweb_tkhtml/tkhtml/manylinux1_x86_64/libTkhtml3.1TclTk9.so
 tkinterweb_tkhtml/tkhtml/manylinux2014_aarch64/libTkhtml3.0.so
 tkinterweb_tkhtml/tkhtml/win32/libTkhtml3.0.dll
-tkinterweb_tkhtml/tkhtml/win_amd64/libTkhtml3.0.dll
+tkinterweb_tkhtml/tkhtml/win_amd64/libTkhtml3.0.dll
+tkinterweb_tkhtml/tkhtml/win_amd64/libTkhtml3.1TclTk9.dll