tkinterweb 4.17.1__tar.gz → 4.17.2__tar.gz

{tkinterweb-4.17.1/tkinterweb.egg-info → tkinterweb-4.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb
-Version: 4.17.1
+Version: 4.17.2
 Summary: HTML/CSS viewer, editor, and app builder for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb
 License: MIT

{tkinterweb-4.17.1 → tkinterweb-4.17.2}/setup.py

@@ -6,7 +6,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name="tkinterweb",
-    version="4.17.1",
+    version="4.17.2",
     python_requires=">=3.2",
     description="HTML/CSS viewer, editor, and app builder for Tkinter",
     long_description=README,

{tkinterweb-4.17.1 → tkinterweb-4.17.2}/tkinterweb/bindings.py

@@ -735,7 +735,7 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
             thread.start()
 
     def _begin_download(self):
-        # NOTE: this method is thread-safe and is designed to run in a thread
+        # NOTE: this runs in a thread
 
         thread = utilities.get_current_thread()
         self.active_threads.append(thread)
@@ -743,7 +743,7 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
         return thread
 
     def _finish_download(self, thread):
-        # NOTE: this method is thread-safe and is designed to run in a thread
+        # NOTE: this runs in a thread
 
         self.active_threads.remove(thread)
         if len(self.active_threads) == 0:

{tkinterweb-4.17.1 → tkinterweb-4.17.2}/tkinterweb/handlers.py

@@ -479,7 +479,7 @@ class ScriptManager(utilities.BaseManager):
     
     def fetch_scripts(self, attributes, url=None, data=None):
         "Fetch and run scripts"
-        # NOTE: this method is thread-safe and is designed to run in a thread
+        # NOTE: this runs in a thread
 
         thread = self.html._begin_download()
 
@@ -520,7 +520,7 @@ class StyleManager(utilities.BaseManager):
     
     def _on_style(self, attributes, tag_contents):
         "Handle <style> elements."
-        self.html._thread_check(self.fetch_styles, data=tag_contents)
+        self._finish_fetching_styles(data=tag_contents)
 
     def _on_link(self, node):
         "Handle <link> elements."
@@ -536,7 +536,10 @@ class StyleManager(utilities.BaseManager):
             ("stylesheet" in rel)
             and ("all" in media or "screen" in media)
         ):
-            self.html._thread_check(self.fetch_styles, node, url)
+            if url.startswith("file://"):
+                self.fetch_styles(node, url)
+            else:
+                self.html._thread_check(self.fetch_styles, node, url)
             # Onload is fired if and when the stylesheet is parsed
         elif "icon" in rel:
             self.html.icon = url
@@ -564,25 +567,25 @@ class StyleManager(utilities.BaseManager):
         newurl = f"url('{newurl}')"
         return newurl
     
-    def fetch_styles(self, node=None, url=None, data=None):
+    def fetch_styles(self, node=None, url=None):
         "Fetch stylesheets and parse the CSS code they contain"
-        # NOTE: this method is thread-safe and is designed to run in a thread
+        # NOTE: this runs in a thread
 
         thread = self.html._begin_download()
         if url and thread.isrunning():
             self.html.post_message(f"Fetching stylesheet from {utilities.shorten(url)}", True)
             try:
                 data = self.html.download_url(url)[1]
+                if data and thread.isrunning():
+                    self.html.post_to_queue(lambda node=node, url=url, data=data: self._finish_fetching_styles(node, url, data))
+
             except Exception as error:
                 self.html.post_to_queue(lambda message=f"ERROR: could not load stylesheet {url}: {error}",
                     url=url: self.html._finish_resource_load(message, url, "stylesheet", False))
-
-        if data and thread.isrunning():
-            self.html.post_to_queue(lambda node=node, url=url, data=data: self._finish_fetching_styles(node, url, data))
                         
         self.html._finish_download(thread)
 
-    def _finish_fetching_styles(self, node, url, data):
+    def _finish_fetching_styles(self, node=None, url=None, data=None):
         # NOTE: this must run in the main thread
 
         self.html._style_count += 1
@@ -689,13 +692,16 @@ class ImageManager(utilities.BaseManager):
             else:
                 url = url.split("), url(", 1)[0].replace("'", "").replace('"', "")
                 url = self.html.resolve_url(url)
-                self.html._thread_check(self.fetch_images, url, name)
+                if url.startswith("file://"):
+                    self.fetch_images(url, name)
+                else:
+                    self.html._thread_check(self.fetch_images, url, name)
 
         return list((name, self.html.register(self._on_image_delete)))
 
     def fetch_images(self, url, name):
         "Fetch images and display them in the document."
-        # NOTE: this method is thread-safe and is designed to run in a thread
+        # NOTE: this runs in a thread
 
         thread = self.html._begin_download()
         if thread.isrunning():
@@ -717,7 +723,7 @@ class ImageManager(utilities.BaseManager):
 
     def check_images(self, data, name, url, filetype):
         "Invert images if needed and convert SVG images to PNGs."
-        # NOTE: this method is thread-safe and is designed to run in a thread
+        # NOTE: this runs in a thread
 
         data_is_image = False
         if "svg" in filetype:
@@ -887,7 +893,10 @@ class ObjectManager(utilities.BaseManager):
                     return
 
                 self.html.post_message(f"Creating object from {utilities.shorten(data)}")
-                self.html._thread_check(self.fetch_objects, node, data)
+                if data.startswith("file://"):
+                    self.fetch_objects(node, data, straight=True)
+                else:
+                    self.html._thread_check(self.fetch_objects, node, data)
 
     def _on_object_value_change(self, node, attribute, value):
         if attribute == "data":
@@ -898,10 +907,11 @@ class ObjectManager(utilities.BaseManager):
                 # Force reset because it might contain widgets that are added internally
                 self.html.widget_manager.map_node(node, True)
 
-    def fetch_objects(self, node, url):
-        # NOTE: this method is thread-safe and is designed to run in a thread
+    def fetch_objects(self, node, url, straight=False):
+        # NOTE: this runs in a thread
 
         thread = self.html._begin_download()
+
         if thread.isrunning():
             try:
                 url, data, filetype, code = self.html.download_url(url)
@@ -910,9 +920,15 @@ class ObjectManager(utilities.BaseManager):
                     if filetype.startswith("image"):
                         name = self.html.image_manager.allocate_image_name()
                         data, data_is_image = self.html.image_manager.check_images(data, name, url, filetype)
-                        self.html.post_to_queue(lambda node=node, data=data, name=name, url=url, filetype=filetype, data_is_image=data_is_image: self._finish_fetching_image_objects(node, data, name, url, filetype, data_is_image))
+                        if straight:
+                            self._finish_fetching_image_objects(node, data, name, url, filetype, data_is_image)
+                        else:
+                            self.html.post_to_queue(lambda node=node, data=data, name=name, url=url, filetype=filetype, data_is_image=data_is_image: self._finish_fetching_image_objects(node, data, name, url, filetype, data_is_image))
                     elif filetype == "text/html":
-                        self.html.post_to_queue(lambda node=node, data=data, name=name, url=url, filetype=filetype: self._finish_fetching_HTML_objects(node, data, name, url, filetype))
+                        if straight:
+                            self._finish_fetching_HTML_objects(node, data, url, filetype)
+                        else:
+                            self.html.post_to_queue(lambda node=node, data=data, url=url, filetype=filetype: self._finish_fetching_HTML_objects(node, data, url, filetype))
 
             except Exception as error:
                 self.html.post_message(f"ERROR: could not load object element with data {url}: {error}", True)
@@ -920,9 +936,9 @@ class ObjectManager(utilities.BaseManager):
         self.html._finish_download(thread)
 
     def _finish_fetching_image_objects(self, node, data, name, url, filetype, data_is_image):
-        # NOTE: this must run in the main thread
+        # NOTE: this must run in the main thread 
 
-        image = self.html.image_manager.finish_fetching_images(None, data, name, filetype, url, data_is_image)
+        image = self.html.image_manager.finish_fetching_images(data, name, filetype, url, data_is_image)
         self.html.override_node_properties(node, "-tkhtml-replacement-image", f"url({image})")
         self.html.event_manager.post_element_event(node, "onload", None, utilities.ELEMENT_LOADED_EVENT)
 

{tkinterweb-4.17.1 → tkinterweb-4.17.2}/tkinterweb/htmlwidgets.py

@@ -437,7 +437,7 @@ class HtmlFrame(Frame):
             file_url = "file://" + str(file_url)
             self._current_url = file_url
             self._html.post_event(utilities.URL_CHANGED_EVENT)
-        self._continue_loading(file_url, decode=decode, force=force)
+        self.load_url(file_url, decode, force)
 
     def load_website(self, website_url, decode=None, force=False):
         """Convenience method to load a website.
@@ -482,7 +482,8 @@ class HtmlFrame(Frame):
 
         if self._thread_in_progress:
             self._thread_in_progress.stop()
-        if self._html.threading_enabled:
+            
+        if self._html.threading_enabled and not url.startswith("file://"):
             thread = utilities.StoppableThread(target=self._continue_loading, args=(
                 url,), kwargs={"decode": decode, "force": force, "thread_safe": True})
             self._thread_in_progress = thread
@@ -1131,6 +1132,9 @@ class HtmlFrame(Frame):
 
         if self.unshrink:
             if event.x and self._prev_configure != (event.width, event.x):
+                # if not self._html.using_tkhtml30:
+                #    self._html.configure(textwrap=False)
+                #    self.after(10, lambda: self._html.configure(textwrap=True))
                 self.after_idle(lambda: self._html.configure(
                     width=self.winfo_screenwidth(), 
                     height=event.height)
@@ -1183,7 +1187,7 @@ class HtmlFrame(Frame):
 
     def _continue_loading(self, url, data="", method="GET", decode=None, force=False, thread_safe=False):
         "Finish loading urls and handle URI fragments."
-        # NOTE: this method is thread-safe and is designed to run in a thread
+        # NOTE: this runs in a thread
 
         code = 404
         self._current_url = url
@@ -1271,7 +1275,7 @@ class HtmlFrame(Frame):
         if self._current_url != url:
             self._html.post_event(utilities.URL_CHANGED_EVENT)
         text = self._get_about_page("about:image", name)
-        self._html.image_manager.finish_fetching_images(None, data, name, url, filetype, data_is_image)
+        self._html.image_manager.finish_fetching_images(data, name, url, filetype, data_is_image)
         self.load_html(text, url)
     
     def _finish_loading_nothing(self):

{tkinterweb-4.17.1 → tkinterweb-4.17.2}/tkinterweb/utilities.py

@@ -31,7 +31,7 @@ __title__ = "TkinterWeb"
 __author__ = "Andrew Clarke"
 __copyright__ = "(c) 2021-2025 Andrew Clarke"
 __license__ = "MIT"
-__version__ = "4.17.1"
+__version__ = "4.17.2"
 
 
 ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "resources")

{tkinterweb-4.17.1 → tkinterweb-4.17.2/tkinterweb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb
-Version: 4.17.1
+Version: 4.17.2
 Summary: HTML/CSS viewer, editor, and app builder for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb
 License: MIT