Merged revisions 81703 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81703 | martin.v.loewis | 2010-06-04 21:50:26 +0200 (Fr, 04 Jun 2010) | 10 lines

  Merged revisions 81701 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81701 | martin.v.loewis | 2010-06-04 21:39:07 +0200 (Fr, 04 Jun 2010) | 2 lines

    Issue #6470: Drop UNC prefix in FixTk.py
    Patch by Christop Gohlke and Amaury Forgeot d'Arc.
  ........
................

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index eebdd255b82616eb66b7bd4e0f83114fbf7cdc61..a269db831adcc05b68e15b938f599d62b9ce9095 100644 (file)
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -127,6 +127,31 @@ class TclTest(unittest.TestCase):
         tcl = self.interp
         self.assertRaises(TclError,tcl.eval,'package require DNE')
 
+    def testLoadWithUNC(self):
+        import sys
+        if sys.platform != 'win32':
+            return
+
+        # Build a UNC path from the regular path.
+        # Something like
+        #   \\%COMPUTERNAME%\c$\python27\python.exe
+
+        fullname = os.path.abspath(sys.executable)
+        if fullname[1] != ':':
+            return
+        unc_name = r'\\%s\%s$\%s' % (os.environ['COMPUTERNAME'],
+                                    fullname[0],
+                                    fullname[3:])
+
+        with test_support.EnvironmentVarGuard() as env:
+            env.unset("TCL_LIBRARY")
+            f = os.popen('%s -c "import Tkinter; print Tkinter"' % (unc_name,))
+
+        self.assert_('Tkinter.py' in f.read())
+        # exit code must be zero
+        self.assertEqual(f.close(), None)
+
+
 
 def test_main():
     support.run_unittest(TclTest, TkinterTest)

diff --git a/Lib/tkinter/_fix.py b/Lib/tkinter/_fix.py
index c11d663bf82537dea1ba80cbc1b5db26a841a9ad..5a69d897876b2160febc395d5e97d4643bb2f043 100644 (file)
--- a/Lib/tkinter/_fix.py
+++ b/Lib/tkinter/_fix.py
@@ -42,6 +42,8 @@ else:
         # Ignore leading \\?\
         if s.startswith("\\\\?\\"):
             s = s[4:]
+        if s.startswith("UNC"):
+            s = "\\" + s[3:]
         return s
 
 prefix = os.path.join(sys.prefix,"tcl")

diff --git a/Misc/NEWS b/Misc/NEWS
index 213cc03f762b0415040c743415eebfd3e3d74f27..df3474a09fb81f267181cdf209ec56565e63dd29 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -54,6 +54,8 @@ C-API
 Library
 -------
 
+- Issue #6470: Drop UNC prefix in FixTk.
+
 - Issue #4768: base64 encoded email body parts were incorrectly stored as
   binary strings.  They are now correctly converted to strings.