[pypy-commit] pypy compile_ncurses_tcl_tk_suse_latest: close branch to be merged

mattip pypy.commits at gmail.com
Tue Sep 10 01:59:36 EDT 2019


Author: Matti Picus <matti.picus at gmail.com>
Branch: compile_ncurses_tcl_tk_suse_latest
Changeset: r97411:295e9e2d5447
Date: 2019-09-10 08:33 +0300
http://bitbucket.org/pypy/pypy/changeset/295e9e2d5447/

Log:	close branch to be merged

diff --git a/lib_pypy/_tkinter/tklib_build.py b/lib_pypy/_tkinter/tklib_build.py
--- a/lib_pypy/_tkinter/tklib_build.py
+++ b/lib_pypy/_tkinter/tklib_build.py
@@ -37,7 +37,7 @@
             incdirs = []
             linklibs = ['tcl' + _ver, 'tk' + _ver]
             for lib in ['/usr/lib/lib', '/usr/lib64/lib']: 
-                if os.path.isfile(''.join([ lib, linklibs[1], '.so'])):
+                if os.path.isfile(''.join([lib, linklibs[1], '.so'])):
                     found = True
                     break
             if found:
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -66,3 +66,7 @@
 .. branch: cryptograhpt-2.7
 
 Update vendored cryptography used for _ssl to 2.7
+
+.. branch: compile_ncurses_tcl_tk_suse_latest
+
+Check for headers and runtime libraries in more locations to support other linuxes


More information about the pypy-commit mailing list