merge branch to update Tk/Tcl to 8.6 on windows

4 files changed, 12 insertions, 8 deletions

diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py
index 1375c24fcc..45da13b17f 100644
--- a/lib_pypy/_tkinter/app.py
+++ b/lib_pypy/_tkinter/app.py
@@ -36,8 +36,8 @@ def Tcl_AppInit(app):
     from os.path import join, dirname, exists, sep
     if sys.platform == 'win32':
         lib_path = join(dirname(dirname(dirname(__file__))), 'tcl')
-        tcl_path = join(lib_path, 'tcl8.5')
-        tk_path = join(lib_path, 'tk8.5')
+        tcl_path = join(lib_path, 'tcl8.6')
+        tk_path = join(lib_path, 'tk8.6')
         tcl_path = tcl_path.replace(sep, '/')
         tk_path = tk_path.replace(sep, '/')
     else:
diff --git a/lib_pypy/_tkinter/tklib_build.py b/lib_pypy/_tkinter/tklib_build.py
index 81c3be37aa..95a44a5b71 100644
--- a/lib_pypy/_tkinter/tklib_build.py
+++ b/lib_pypy/_tkinter/tklib_build.py
@@ -15,7 +15,7 @@ elif sys.platform.startswith("freebsd"):
     libdirs = ['/usr/local/lib']
 elif sys.platform == 'win32':
     incdirs = []
-    linklibs = ['tcl85', 'tk85']
+    linklibs = ['tcl86t', 'tk86t']
     libdirs = []
 elif sys.platform == 'darwin':
     # homebrew
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
index d195d41f61..9f9598c2ff 100644
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -66,3 +66,7 @@ e.g. it's always constant-folded away
 Optimize instances with integer or float fields to have more efficent field
 reads and writes. They also use less memory if they have at least two such
 fields.
+
+.. branch: win-tcl8.6
+
+Update the version of Tk/Tcl on windows to 8.6
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
index cb732e5e99..458adf645e 100755
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -154,7 +154,7 @@ def create_package(basedir, options, _fake=False):
                       ('sqlite3.dll', lib_pypy)]
         if not options.no__tkinter:
             tkinter_dir = lib_pypy.join('_tkinter')
-            win_extras += [('tcl85.dll', tkinter_dir), ('tk85.dll', tkinter_dir)]
+            win_extras += [('tcl86t.dll', tkinter_dir), ('tk86t.dll', tkinter_dir)]
 
         for extra,target_dir in win_extras:
             p = pypy_c.dirpath().join(extra)
@@ -181,15 +181,15 @@ def create_package(basedir, options, _fake=False):
             # library was created?
         if not options.no__tkinter:
             try:
-                p = pypy_c.dirpath().join('tcl85.dll')
+                p = pypy_c.dirpath().join('tcl86t.dll')
                 if not p.check():
-                    p = py.path.local.sysfind('tcl85.dll')
+                    p = py.path.local.sysfind('tcl86t.dll')
                     if p is None:
-                        raise WindowsError("tcl85.dll not found")
+                        raise WindowsError("tcl86t.dll not found")
                 tktcldir = p.dirpath().join('..').join('lib')
                 shutil.copytree(str(tktcldir), str(pypydir.join('tcl')))
             except WindowsError:
-                print("Packaging Tk runtime failed. tk85.dll and tcl85.dll "
+                print("Packaging Tk runtime failed. tk86t.dll and tcl86t.dll "
                       "found in %s, expecting to find runtime in %s directory "
                       "next to the dlls, as per build "
                       "instructions." %(p, tktcldir), file=sys.stderr)