tkinterdnd2 0.4.2__tar.gz → 0.4.4__tar.gz

{tkinterdnd2-0.4.2/tkinterdnd2.egg-info → tkinterdnd2-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: tkinterdnd2
-Version: 0.4.2
+Version: 0.4.4
 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
@@ -10,6 +10,14 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 ## TkinterDnD2
 

{tkinterdnd2-0.4.2 → tkinterdnd2-0.4.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tkinterdnd2",
-    version="0.4.2",
+    version="0.4.4",
     author="petasis\\pmgagne\\eliav2",
     description="TkinterDnD2 is a python wrapper for George Petasis'' tkDnD Tk extension version 2",
     long_description=long_description,

{tkinterdnd2-0.4.2 → tkinterdnd2-0.4.4}/tkinterdnd2/TkinterDnD.py

@@ -30,26 +30,40 @@ def _require(tkroot):
     '''Internal function.'''
     global TkdndVersion
     try:
-        import os.path
+        import os
         import platform
 
-        if platform.system()=="Darwin" and platform.machine()=="arm64":
+        # On Windows, platform.machine() returns the identifier of the
+        # *host* architecture, which does not necessarily match the
+        # architecture of the running python process. For example, when
+        # running x86 python under x64 Windows, the return value is AMD64;
+        # when running either x86 or x64 python under arm64 Windows, the
+        # return value is ARM64. The architecture of the running process
+        # can be obtained from the PROCESSOR_ARCHITECTURE environment variable,
+        # which is automatically set by Windows / WOW subsystem.
+        system = platform.system()
+        if system=="Windows":
+            machine = os.environ.get('PROCESSOR_ARCHITECTURE', platform.machine())
+        else:
+            machine = platform.machine()
+
+        if system=="Darwin" and machine=="arm64":
             tkdnd_platform_rep = "osx-arm64"
-        elif platform.system()=="Darwin" and platform.machine()=="x86_64":
+        elif system=="Darwin" and machine=="x86_64":
             tkdnd_platform_rep = "osx-x64"
-        elif platform.system()=="Linux" and platform.machine()=="aarch64":
+        elif system=="Linux" and machine=="aarch64":
             tkdnd_platform_rep = "linux-arm64"
-        elif platform.system()=="Linux" and platform.machine()=="x86_64":
+        elif system=="Linux" and machine=="x86_64":
             tkdnd_platform_rep = "linux-x64"
-        elif platform.system()=="Windows" and platform.machine()=="ARM64":
+        elif system=="Windows" and machine=="ARM64":
             tkdnd_platform_rep = "win-arm64"
-        elif platform.system()=="Windows" and platform.machine()=="AMD64":
+        elif system=="Windows" and machine=="AMD64":
             tkdnd_platform_rep = "win-x64"
-        elif platform.system()=="Windows" and platform.machine()=="x86":
+        elif system=="Windows" and machine=="x86":
             tkdnd_platform_rep = "win-x86"
         else:
             raise RuntimeError('Plaform not supported.')
-        
+
         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')

{tkinterdnd2-0.4.2 → tkinterdnd2-0.4.4}/tkinterdnd2/tkdnd/linux-x64/pkgIndex.tcl

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

{tkinterdnd2-0.4.2/tkinterdnd2/tkdnd/win-x64 → tkinterdnd2-0.4.4/tkinterdnd2/tkdnd/linux-x64}/tkdnd.tcl

@@ -534,5 +534,21 @@ proc ::tkdnd::urn_unquote {url} {
     set start [incr last]
   }
   append result [string range $url $start end]
-  return [encoding convertfrom utf-8 $result]
+  return [from_encoding utf-8 $result]
 };# tkdnd::urn_unquote
+
+if {[package vsatisfies [package require Tcl] 9]} {
+    proc ::tkdnd::to_encoding {enc str} {
+        encoding convertto -profile replace $enc $str
+    }
+    proc ::tkdnd::from_encoding {enc data} {
+        encoding convertfrom -profile replace $enc $data
+    }
+} else {
+    proc ::tkdnd::to_encoding {enc str} {
+        encoding convertto $enc $str
+    }
+    proc ::tkdnd::from_encoding {enc data} {
+        encoding convertfrom $enc $data
+    }
+}

{tkinterdnd2-0.4.2/tkinterdnd2/tkdnd/osx-x64 → tkinterdnd2-0.4.4/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 {
-            encoding convertfrom unicode $data
+            ::tkdnd::from_encoding unicode $data
            } string]} {
         set string $data
       }
@@ -241,7 +241,7 @@ proc xdnd::normalise_data { type data } {
     text/plain\;charset=utf-8 -
     text/plain {
       if {[catch {
-            encoding convertfrom utf-8 [tkdnd::bytes_to_string $data]
+            ::tkdnd::from_encoding utf-8 [tkdnd::bytes_to_string $data]
            } string]} {
         set string $data
       }
@@ -249,7 +249,7 @@ proc xdnd::normalise_data { type data } {
     }
     text/uri-list* {
       if {[catch {
-            encoding convertfrom utf-8 [tkdnd::bytes_to_string $data]
+            ::tkdnd::from_encoding utf-8 [tkdnd::bytes_to_string $data]
           } string]} {
         set string $data
       }
@@ -800,7 +800,7 @@ proc xdnd::_SendData {type offset bytes args} {
     ## Prepare the data to be transferred...
     switch -glob $type {
       text/plain* - UTF8_STRING - STRING - TEXT - COMPOUND_TEXT {
-        binary scan [encoding convertto utf-8 $typed_data] \
+        binary scan [::tkdnd::to_encoding utf-8 $typed_data] \
                     c* _dodragdrop_transfer_data
         set _dodragdrop_transfer_data \
            [_convert_to_unsigned $_dodragdrop_transfer_data $format]
@@ -813,7 +813,7 @@ proc xdnd::_SendData {type offset bytes args} {
             default   {lappend files file://$file}
           }
         }
-        binary scan [encoding convertto utf-8 "[join $files \r\n]\r\n"] \
+        binary scan [::tkdnd::to_encoding utf-8 "[join $files \r\n]\r\n"] \
                     c* _dodragdrop_transfer_data
         set _dodragdrop_transfer_data \
            [_convert_to_unsigned $_dodragdrop_transfer_data $format]
@@ -849,7 +849,7 @@ proc xdnd::_SendData {type offset bytes args} {
   set data [lrange $_dodragdrop_transfer_data $offset [expr {$offset+$bytes-1}]]
   switch $format {
     8  {
-      set data [encoding convertfrom utf-8 [binary format c* $data]]
+      set data [::tkdnd::from_encoding utf-8 [binary format c* $data]]
     }
     16 {
       variable _dodragdrop_selection_requestor

{tkinterdnd2-0.4.2/tkinterdnd2/tkdnd/osx-x64 → tkinterdnd2-0.4.4/tkinterdnd2/tkdnd/linux-x64}/tkdnd_windows.tcl

@@ -161,7 +161,7 @@ proc olednd::normalise_data { type data } {
   switch [lindex [::tkdnd::generic::platform_independent_type $type] 0] {
     DND_Text   {return $data}
     DND_Files  {return $data}
-    DND_HTML   {return [encoding convertfrom utf-8 $data]}
+    DND_HTML   {return [::tkdnd::from_encoding utf-8 $data]}
     default    {return $data}
   }
 }; # olednd::normalise_data

{tkinterdnd2-0.4.2 → tkinterdnd2-0.4.4}/tkinterdnd2/tkdnd/osx-arm64/pkgIndex.tcl

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

{tkinterdnd2-0.4.2/tkinterdnd2/tkdnd/win-x86 → tkinterdnd2-0.4.4/tkinterdnd2/tkdnd/osx-arm64}/tkdnd.tcl

@@ -534,5 +534,21 @@ proc ::tkdnd::urn_unquote {url} {
     set start [incr last]
   }
   append result [string range $url $start end]
-  return [encoding convertfrom utf-8 $result]
+  return [from_encoding utf-8 $result]
 };# tkdnd::urn_unquote
+
+if {[package vsatisfies [package require Tcl] 9]} {
+    proc ::tkdnd::to_encoding {enc str} {
+        encoding convertto -profile replace $enc $str
+    }
+    proc ::tkdnd::from_encoding {enc data} {
+        encoding convertfrom -profile replace $enc $data
+    }
+} else {
+    proc ::tkdnd::to_encoding {enc str} {
+        encoding convertto $enc $str
+    }
+    proc ::tkdnd::from_encoding {enc data} {
+        encoding convertfrom $enc $data
+    }
+}