tkinterdnd2 0.5.0__tar.gz → 0.6.0__tar.gz

{tkinterdnd2-0.5.0/tkinterdnd2.egg-info → tkinterdnd2-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tkinterdnd2
-Version: 0.5.0
+Version: 0.6.0
 Summary: TkinterDnD2 is a python wrapper for George Petasis'' tkDnD Tk extension version 2
 Home-page: https://github.com/Eliav2/tkinterdnd2
 Author: petasis\pmgagne\eliav2\squiblydoo
@@ -28,17 +28,11 @@ This repo was originally forked and edited for the purpose of publishing to pypi
 This repository is being maintained to ensure availability of `tkinterdnd2` into the future, providing Tkinter native drag and drop support for windows, unix and Mac OSX.
 
 
-### What is TkDnD2
+### What is TkDnD
 
 [tkDnD2](https://github.com/petasis/tkdnd) is a tcl/Tk extension adding native drag and drop support.
 
-### What this repository is about
-
-This repo package TkinterDnD2 and tkdnd2 into a standard python module.
-
-When the extension is imported in python its location will be automatically added to the Tk search path.
-
-This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.4. In order to provide support on ARM, we include built binaries from the now defunct [tkinterdnd2-universal](https://pypi.org/project/tkinterdnd2-universal/#files) which added ARM support.
+This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.5 and my own compiled binaries for full Tcl 9 support: https://github.com/Squiblydoo/tkdnd.
 
 
 ## Install

{tkinterdnd2-0.5.0 → tkinterdnd2-0.6.0}/README.md

@@ -7,17 +7,11 @@ This repo was originally forked and edited for the purpose of publishing to pypi
 This repository is being maintained to ensure availability of `tkinterdnd2` into the future, providing Tkinter native drag and drop support for windows, unix and Mac OSX.
 
 
-### What is TkDnD2
+### What is TkDnD
 
 [tkDnD2](https://github.com/petasis/tkdnd) is a tcl/Tk extension adding native drag and drop support.
 
-### What this repository is about
-
-This repo package TkinterDnD2 and tkdnd2 into a standard python module.
-
-When the extension is imported in python its location will be automatically added to the Tk search path.
-
-This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.4. In order to provide support on ARM, we include built binaries from the now defunct [tkinterdnd2-universal](https://pypi.org/project/tkinterdnd2-universal/#files) which added ARM support.
+This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.5 and my own compiled binaries for full Tcl 9 support: https://github.com/Squiblydoo/tkdnd.
 
 
 ## Install

{tkinterdnd2-0.5.0 → tkinterdnd2-0.6.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tkinterdnd2",
-    version="0.5.0",
+    version="0.6.0",
     author="petasis\\pmgagne\\eliav2\\squiblydoo",
     description="TkinterDnD2 is a python wrapper for George Petasis'' tkDnD Tk extension version 2",
     long_description=long_description,
@@ -15,7 +15,14 @@ setuptools.setup(
     include_package_data=True,
     package_data={
         # Include tkdnd extension files.
-        "tkinterdnd2": ["tkdnd/linux-x64/*.*", "tkdnd/linux-arm64/*.*", "tkdnd/osx-x64/*.*", "tkdnd/osx-arm64/*.*", "tkdnd/win-x64/*.*", "tkdnd/win-x86/*.*", "tkdnd/win-arm64/*.*"],
+        "tkinterdnd2": [
+            "tkdnd/linux-x64/*.*", "tkdnd/linux-x64-tcl9/*.*",
+            "tkdnd/linux-arm64/*.*", "tkdnd/linux-arm64-tcl9/*.*",
+            "tkdnd/osx-x64/*.*", "tkdnd/osx-arm64/*.*",
+            "tkdnd/win-x64/*.*", "tkdnd/win-x64-tcl9/*.*",
+            "tkdnd/win-x86/*.*", "tkdnd/win-x86-tcl9/*.*",
+            "tkdnd/win-arm64/*.*",
+        ],
     },
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",

tkinterdnd2-0.6.0/tests/test_tkinterdnd2.py

@@ -0,0 +1,89 @@
+import os
+import platform
+import unittest
+import tkinterdnd2
+
+
+class TestTkinterDnD2(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.root = tkinterdnd2.Tk()
+        cls.root.withdraw()
+
+        cls.tcl_version_str = cls.root.tk.call('info', 'tclversion')
+        cls.tcl_major = int(cls.tcl_version_str.split('.')[0])
+
+        system = platform.system()
+        if system == "Windows":
+            machine = os.environ.get('PROCESSOR_ARCHITECTURE', platform.machine())
+        else:
+            machine = platform.machine()
+
+        platform_map = {
+            ("Darwin",  "arm64"):   "osx-arm64",
+            ("Darwin",  "x86_64"):  "osx-x64",
+            ("Linux",   "aarch64"): "linux-arm64",
+            ("Linux",   "x86_64"):  "linux-x64",
+            ("Windows", "ARM64"):   "win-arm64",
+            ("Windows", "AMD64"):   "win-x64",
+            ("Windows", "x86"):     "win-x86",
+        }
+        cls.base_dir = platform_map.get((system, machine), "unknown")
+        cls.tkdnd_root = os.path.join(os.path.dirname(tkinterdnd2.__file__), 'tkdnd')
+        tcl9_path = os.path.join(cls.tkdnd_root, cls.base_dir + '-tcl9')
+        cls.chosen_dir = (
+            cls.base_dir + '-tcl9'
+            if cls.tcl_major >= 9 and os.path.isdir(tcl9_path)
+            else cls.base_dir
+        )
+
+        print(
+            f"\nPlatform: {system}/{machine}  "
+            f"Tcl: {cls.tcl_version_str}  "
+            f"dir: {cls.chosen_dir}  "
+            f"tkdnd: {tkinterdnd2.TkinterDnD.TkdndVersion}"
+        )
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.root.destroy()
+
+    def test_version_is_set(self):
+        """Binary loaded and TkdndVersion is populated."""
+        self.assertIsNotNone(tkinterdnd2.TkinterDnD.TkdndVersion)
+
+    def test_expected_version(self):
+        """Loaded tkdnd version matches what is shipped for this platform."""
+        # osx-x64 still ships the old 2.9.4 binary; all others are 2.10.0
+        if self.base_dir == 'osx-x64':
+            self.assertEqual(tkinterdnd2.TkinterDnD.TkdndVersion, '2.9.4')
+        else:
+            self.assertEqual(tkinterdnd2.TkinterDnD.TkdndVersion, '2.10.0')
+
+    def test_binary_directory_exists(self):
+        """The directory that was selected exists inside the installed package."""
+        path = os.path.join(self.tkdnd_root, self.chosen_dir)
+        self.assertTrue(os.path.isdir(path), f"tkdnd directory not found: {path}")
+
+    def test_tcl9_routing(self):
+        """When Tcl 9 is active and a -tcl9 directory is present, it must be chosen."""
+        tcl9_dir = os.path.join(self.tkdnd_root, self.base_dir + '-tcl9')
+        if self.tcl_major >= 9 and os.path.isdir(tcl9_dir):
+            self.assertTrue(
+                self.chosen_dir.endswith('-tcl9'),
+                f"Tcl {self.tcl_major} active but -tcl9 directory not chosen; got '{self.chosen_dir}'"
+            )
+
+    def test_tcl8_fallback(self):
+        """When Tcl 8 is active (or no -tcl9 directory exists), base directory must be chosen."""
+        tcl9_dir = os.path.join(self.tkdnd_root, self.base_dir + '-tcl9')
+        if self.tcl_major < 9 or not os.path.isdir(tcl9_dir):
+            self.assertFalse(
+                self.chosen_dir.endswith('-tcl9'),
+                f"Expected base directory but got '{self.chosen_dir}'"
+            )
+
+
+if __name__ == '__main__':
+    unittest.main()

{tkinterdnd2-0.5.0 → tkinterdnd2-0.6.0}/tkinterdnd2/TkinterDnD.py

@@ -64,7 +64,12 @@ def _require(tkroot):
         else:
             raise RuntimeError('Plaform not supported.')
 
-        module_path = os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep)
+        tcl_major = int(tkroot.tk.call('info', 'tclversion').split('.')[0])
+        if tcl_major >= 9:
+            tcl9_path = os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep + '-tcl9')
+            module_path = tcl9_path if os.path.isdir(tcl9_path) else os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep)
+        else:
+            module_path = os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep)
         tkroot.tk.call('lappend', 'auto_path', module_path)
         TkdndVersion = tkroot.tk.call('package', 'require', 'tkdnd')
     except tkinter.TclError:

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/linux-x64 → tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-arm64}/pkgIndex.tcl

@@ -53,10 +53,10 @@ namespace eval ::tkdnd {
 
 }; # namespace ::tkdnd
 
-package ifneeded tkdnd 2.9.5 \
+package ifneeded tkdnd 2.10.0 \
   "tkdnd::source \{$dir/tkdnd.tcl\} ; \
-   tkdnd::initialise \{$dir\} libtkdnd2.9.5.so tkdnd"
+   tkdnd::initialise \{$dir\} libtkdnd2.10.0.so tkdnd"
 
-package ifneeded tkdnd::utils 2.9.5 \
+package ifneeded tkdnd::utils 2.10.0 \
   "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
-   package provide tkdnd::utils 2.9.5"
+   package provide tkdnd::utils 2.10.0"

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/osx-arm64 → tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-arm64}/tkdnd_unix.tcl

@@ -231,7 +231,7 @@ proc xdnd::normalise_data { type data } {
     STRING - UTF8_STRING - TEXT - COMPOUND_TEXT {return $data}
     text/html {
       if {[catch {
-            ::tkdnd::from_encoding unicode $data
+            ::tkdnd::from_encoding utf-16 $data
            } string]} {
         set string $data
       }
@@ -838,7 +838,7 @@ proc xdnd::_SendData {type offset bytes args} {
       }
       default {
         set format 32
-        binary scan $typed_data c* _dodragdrop_transfer_data
+        binary scan [encoding convertto utf-8 $typed_data] c* _dodragdrop_transfer_data
       }
     }
   }

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/linux-arm64 → tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-arm64-tcl9}/pkgIndex.tcl

@@ -53,10 +53,10 @@ namespace eval ::tkdnd {
 
 }; # namespace ::tkdnd
 
-package ifneeded tkdnd 2.9.3 \
+package ifneeded tkdnd 2.10.0 \
   "tkdnd::source \{$dir/tkdnd.tcl\} ; \
-   tkdnd::initialise \{$dir\} libtkdnd2.9.3[info sharedlibextension] tkdnd"
+   tkdnd::initialise \{$dir\} libtcl9tkdnd2.10.0.so tkdnd"
 
-package ifneeded tkdnd::utils 2.9.3 \
+package ifneeded tkdnd::utils 2.10.0 \
   "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
-   package provide tkdnd::utils 2.9.3"
+   package provide tkdnd::utils 2.10.0"

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/linux-x64 → tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-arm64-tcl9}/tkdnd_unix.tcl

@@ -231,7 +231,7 @@ proc xdnd::normalise_data { type data } {
     STRING - UTF8_STRING - TEXT - COMPOUND_TEXT {return $data}
     text/html {
       if {[catch {
-            ::tkdnd::from_encoding unicode $data
+            ::tkdnd::from_encoding utf-16 $data
            } string]} {
         set string $data
       }
@@ -838,7 +838,7 @@ proc xdnd::_SendData {type offset bytes args} {
       }
       default {
         set format 32
-        binary scan $typed_data c* _dodragdrop_transfer_data
+        binary scan [encoding convertto utf-8 $typed_data] c* _dodragdrop_transfer_data
       }
     }
   }

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/osx-arm64 → tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64}/pkgIndex.tcl

@@ -53,10 +53,10 @@ namespace eval ::tkdnd {
 
 }; # namespace ::tkdnd
 
-package ifneeded tkdnd 2.9.5 \
+package ifneeded tkdnd 2.10.0 \
   "tkdnd::source \{$dir/tkdnd.tcl\} ; \
-   tkdnd::initialise \{$dir\} libtcl9tkdnd2.9.5.dylib tkdnd"
+   tkdnd::initialise \{$dir\} libtkdnd2.10.0.so tkdnd"
 
-package ifneeded tkdnd::utils 2.9.5 \
+package ifneeded tkdnd::utils 2.10.0 \
   "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
-   package provide tkdnd::utils 2.9.5"
+   package provide tkdnd::utils 2.10.0"

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/win-x86 → tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64}/tkdnd_unix.tcl

@@ -231,7 +231,7 @@ proc xdnd::normalise_data { type data } {
     STRING - UTF8_STRING - TEXT - COMPOUND_TEXT {return $data}
     text/html {
       if {[catch {
-            ::tkdnd::from_encoding unicode $data
+            ::tkdnd::from_encoding utf-16 $data
            } string]} {
         set string $data
       }
@@ -838,7 +838,7 @@ proc xdnd::_SendData {type offset bytes args} {
       }
       default {
         set format 32
-        binary scan $typed_data c* _dodragdrop_transfer_data
+        binary scan [encoding convertto utf-8 $typed_data] c* _dodragdrop_transfer_data
       }
     }
   }

tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64-tcl9/pkgIndex.tcl

@@ -0,0 +1,62 @@
+#
+# Tcl package index file
+#
+
+namespace eval ::tkdnd {
+  ## Check if a debug level must be set...
+  if {[info exists ::TKDND_DEBUG_LEVEL]} {
+    variable _debug_level $::TKDND_DEBUG_LEVEL
+  } elseif {[info exists ::env(TKDND_DEBUG_LEVEL)]} {
+    variable _debug_level $::env(TKDND_DEBUG_LEVEL)
+  } else {
+    variable _debug_level 0
+  }
+
+  # ----------------------------------------------------------------------------
+  #  Command tkdnd::debug_enabled: returns the requested debug level (0 = no debug).
+  # ----------------------------------------------------------------------------
+  proc debug_enabled { {level {}} } {
+    variable _debug_level
+    if {$level != {}} {
+      if {[string is integer -strict $level]} {
+        set _debug_level $level
+      } elseif {[string is true $level]} {
+        set _debug_level 1
+      }
+    }
+    return $_debug_level
+  };# debug_enabled
+
+  # ----------------------------------------------------------------------------
+  #  Command tkdnd::source: source a Tcl fileInitialise the TkDND package.
+  # ----------------------------------------------------------------------------
+  proc source { filename { encoding utf-8 } } {
+    variable _package_dir
+    # If in debug mode, enable debug statements...
+    set dbg_lvl [debug_enabled]
+    if {$dbg_lvl} {
+      puts "tkdnd::source (debug level $dbg_lvl) $filename"
+      set fd [open $filename r]
+      fconfigure $fd -encoding $encoding
+      set script [read $fd]
+      close $fd
+      set map {}
+      for {set lvl 0} {$lvl <= $dbg_lvl} {incr lvl} {
+        lappend map "#DBG$lvl " {}
+      }
+      lappend map {#DBG } {}
+      set script [string map $map $script]
+      return [eval $script]
+    }
+    ::source -encoding $encoding $filename
+  };# source
+
+}; # namespace ::tkdnd
+
+package ifneeded tkdnd 2.10.0 \
+  "tkdnd::source \{$dir/tkdnd.tcl\} ; \
+   tkdnd::initialise \{$dir\} libtcl9tkdnd2.10.0.so tkdnd"
+
+package ifneeded tkdnd::utils 2.10.0 \
+  "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
+   package provide tkdnd::utils 2.10.0"

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/win-x64 → tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64-tcl9}/tkdnd_unix.tcl

@@ -231,7 +231,7 @@ proc xdnd::normalise_data { type data } {
     STRING - UTF8_STRING - TEXT - COMPOUND_TEXT {return $data}
     text/html {
       if {[catch {
-            ::tkdnd::from_encoding unicode $data
+            ::tkdnd::from_encoding utf-16 $data
            } string]} {
         set string $data
       }
@@ -838,7 +838,7 @@ proc xdnd::_SendData {type offset bytes args} {
       }
       default {
         set format 32
-        binary scan $typed_data c* _dodragdrop_transfer_data
+        binary scan [encoding convertto utf-8 $typed_data] c* _dodragdrop_transfer_data
       }
     }
   }

tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/osx-arm64/pkgIndex.tcl

@@ -0,0 +1,62 @@
+#
+# Tcl package index file
+#
+
+namespace eval ::tkdnd {
+  ## Check if a debug level must be set...
+  if {[info exists ::TKDND_DEBUG_LEVEL]} {
+    variable _debug_level $::TKDND_DEBUG_LEVEL
+  } elseif {[info exists ::env(TKDND_DEBUG_LEVEL)]} {
+    variable _debug_level $::env(TKDND_DEBUG_LEVEL)
+  } else {
+    variable _debug_level 0
+  }
+
+  # ----------------------------------------------------------------------------
+  #  Command tkdnd::debug_enabled: returns the requested debug level (0 = no debug).
+  # ----------------------------------------------------------------------------
+  proc debug_enabled { {level {}} } {
+    variable _debug_level
+    if {$level != {}} {
+      if {[string is integer -strict $level]} {
+        set _debug_level $level
+      } elseif {[string is true $level]} {
+        set _debug_level 1
+      }
+    }
+    return $_debug_level
+  };# debug_enabled
+
+  # ----------------------------------------------------------------------------
+  #  Command tkdnd::source: source a Tcl fileInitialise the TkDND package.
+  # ----------------------------------------------------------------------------
+  proc source { filename { encoding utf-8 } } {
+    variable _package_dir
+    # If in debug mode, enable debug statements...
+    set dbg_lvl [debug_enabled]
+    if {$dbg_lvl} {
+      puts "tkdnd::source (debug level $dbg_lvl) $filename"
+      set fd [open $filename r]
+      fconfigure $fd -encoding $encoding
+      set script [read $fd]
+      close $fd
+      set map {}
+      for {set lvl 0} {$lvl <= $dbg_lvl} {incr lvl} {
+        lappend map "#DBG$lvl " {}
+      }
+      lappend map {#DBG } {}
+      set script [string map $map $script]
+      return [eval $script]
+    }
+    ::source -encoding $encoding $filename
+  };# source
+
+}; # namespace ::tkdnd
+
+package ifneeded tkdnd 2.10.0 \
+  "tkdnd::source \{$dir/tkdnd.tcl\} ; \
+   tkdnd::initialise \{$dir\} libtcl9tkdnd2.10.0.dylib tkdnd"
+
+package ifneeded tkdnd::utils 2.10.0 \
+  "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
+   package provide tkdnd::utils 2.10.0"