Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at 2016-03-14 09:56:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3 (Old) and /work/SRC/openSUSE:Factory/.python3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3" Changes: -------- --- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2015-09-19 06:52:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-base.changes 2016-03-14 09:57:02.000000000 +0100 @@ -1,0 +2,59 @@ +Mon Mar 7 20:38:11 UTC 2016 - [email protected] + +- Add Python-3.5.1-fix_lru_cache_copying.patch + Fix copying the lru_cache() wrapper object. + Fixes deep-copying lru_cache regression, which worked on + previous versions of python but fails on python 3.5. + This fixes a bunch of packages in devel:languages:python3. + See: https://bugs.python.org/issue25447 + +------------------------------------------------------------------- +Wed Dec 9 07:35:20 UTC 2015 - [email protected] + +- update to 3.5.1 + * bugfix-only release, dozens of bugs fixed +- Drop upstreamed Python-3.5.0-_Py_atomic_xxx-symbols.patch +- "Python3" to "Python 3" in summary + * This seems cleaner and fixes and rpmlint warning + +------------------------------------------------------------------- +Wed Oct 14 20:21:52 UTC 2015 - [email protected] + +- Add Python-3.5.0-_Py_atomic_xxx-symbols.patch + This fixes a build error for many packages that use the Python, + C-API. + This patch is already accepted upstream and is slated to appear in + python 3.5.1. + +------------------------------------------------------------------- +Tue Sep 29 15:53:24 UTC 2015 - [email protected] + +- update to 3.5.0 + * coroutines with async/await syntax + * matrix multiplication operator `@` + * unpacking generalizations + * new modules `typing` and `zipapp` + * type annotations + * .pyo files replaced by custom suffixes for optimization levels in __pycache__ + * support for memory BIO in ssl module + * performance improvements in several modules + * and many more +- removals and behavior changes + * deprecated `__version__` is removed + * support for .pyo files was removed + * system calls are auto-retried on EINTR + * bare generator expressions in function calls now cause SyntaxError + (change "f(x for x in i)" to "f((x for x in i))" to fix) + * removed undocumented `format` member of private `PyMemoryViewObject` struct + * renamed `PyMemAllocator` to `PyMemAllocatorEx` +- redefine %dynlib macro to reflect that modules now have arch+os as part of name +- module `time` is now built-in +- dropped upstreamed patches: + python-3.4.1-fix-faulthandler.patch + python-3.4.3-test-conditional-ssl.patch + python-fix-short-dh.patch (also dropped dh2048.pem required for this patch) +- updated patch Python-3.3.0b2-multilib.patch to Python-3.5.0-multilib.patch +- python-ncurses-6.0-accessors.patch taken from python 2 to fix build failure + with new gcc + ncurses + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3-doc.changes 2015-07-05 17:54:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-doc.changes 2016-03-14 09:57:02.000000000 +0100 @@ -1,0 +2,30 @@ +Mon Mar 7 20:38:11 UTC 2016 - [email protected] + +- Add Python-3.5.1-fix_lru_cache_copying.patch + Fix copying the lru_cache() wrapper object. + Fixes deep-copying lru_cache regression, which worked on + previous versions of python but fails on python 3.5. + This fixes a bunch of packages in devel:languages:python3. + See: https://bugs.python.org/issue25447 + +------------------------------------------------------------------- +Sun Jan 24 00:44:08 UTC 2016 - [email protected] + +- Build the docs in .qch format as well + +------------------------------------------------------------------- +Wed Dec 9 07:35:20 UTC 2015 - [email protected] + +- update to 3.5.1 + * bugfix-only release, dozens of bugs fixed +- Drop upstreamed Python-3.5.0-_Py_atomic_xxx-symbols.patch +- "Python" to "Python 3" in summary +- Add python-Sphinx version requirement (1.2) + +------------------------------------------------------------------- +Thu Oct 1 15:50:45 UTC 2015 - [email protected] + +- update to 3.5.0 + * see python3-base.changes for details + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3.changes 2015-09-19 06:52:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3.changes 2016-03-14 09:57:02.000000000 +0100 @@ -1,0 +2,35 @@ +Mon Mar 7 20:38:11 UTC 2016 - [email protected] + +- Add Python-3.5.1-fix_lru_cache_copying.patch + Fix copying the lru_cache() wrapper object. + Fixes deep-copying lru_cache regression, which worked on + previous versions of python but fails on python 3.5. + This fixes a bunch of packages in devel:languages:python3. + See: https://bugs.python.org/issue25447 + +------------------------------------------------------------------- +Wed Dec 9 07:35:20 UTC 2015 - [email protected] + +- update to 3.5.1 + * bugfix-only release, dozens of bugs fixed +- Drop upstreamed Python-3.5.0-_Py_atomic_xxx-symbols.patch +- "Python3" to "Python 3" in summary + * This seems cleaner and fixes and rpmlint warning + +------------------------------------------------------------------- +Wed Oct 14 20:21:52 UTC 2015 - [email protected] + +- Add python3-3.5.0-_Py_atomic_xxx-symbols.patch + This fixes a build error for many packages that use the Python, + C-API. + This patch is already accepted upstream and is slated to appear in + python 3.5.1. + +------------------------------------------------------------------- +Thu Oct 1 15:00:17 UTC 2015 - [email protected] + +- update to 3.5.0 + * see python3-base.changes for details +- update list of tests + +------------------------------------------------------------------- Old: ---- Python-3.3.0b2-multilib.patch Python-3.4.3.tar.xz Python-3.4.3.tar.xz.asc dh2048.pem python-3.4.1-fix-faulthandler.patch python-3.4.3-test-conditional-ssl.patch python-fix-short-dh.patch New: ---- Python-3.5.0-multilib.patch Python-3.5.1-fix_lru_cache_copying.patch Python-3.5.1.tar.xz Python-3.5.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-base.spec ++++++ --- /var/tmp/diff_new_pack.flfLGD/_old 2016-03-14 09:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.flfLGD/_new 2016-03-14 09:57:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-base # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,10 +33,10 @@ BuildRequires: xz BuildRequires: zlib-devel Url: http://www.python.org/ -Summary: Python3 Interpreter +Summary: Python 3 Interpreter License: Python-2.0 Group: Development/Languages/Python -Version: 3.4.3 +Version: 3.5.1 Release: 0 %define tarversion %{version} %define tarname Python-%{tarversion} @@ -60,7 +60,6 @@ Source8: macros.python3.py Source9: import_failed.py Source10: import_failed.map -Source11: dh2048.pem # The following files are not used in the build. # They are listed here to work around missing functionality in rpmbuild, @@ -74,7 +73,7 @@ # implement "--record-rpm" option for distutils installations Patch01: Python-3.0b1-record-rpm.patch # support lib-vs-lib64 distinction -Patch02: Python-3.3.0b2-multilib.patch +Patch02: Python-3.5.0-multilib.patch # securing usage of readlink/realpath in PySys_SetArgv Patch03: python-2.6b1-canonicalize2.patch # support finding packages in /usr/local, install to /usr/local by default @@ -89,16 +88,12 @@ Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch # Raise timeout value for test_subprocess Patch15: subprocess-raise-timeout.patch -# Upstream patch for bogus faulthandler which fails with GCC 5 -Patch17: python-3.4.1-fix-faulthandler.patch -# PATCH-FIX-UPSTREAM require SSL conditionally in test_urllib -Patch18: python-3.4.3-test-conditional-ssl.patch # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch19: python-2.7-libffi-aarch64.patch -# PATCH-FIX-OPENSUSE python-fix-short-dh.patch replace too short dh parameters by 2048bit one -Patch20: python-fix-short-dh.patch # PATCH-FIX-UPSTREAM python3-ncurses-6.0-accessors.patch [email protected] -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 -Patch21: python3-ncurses-6.0-accessors.patch +Patch20: python3-ncurses-6.0-accessors.patch +# PATCH-FIX-UPSTREAM Python-3.5.1-fix_lru_cache_copying.patch -- Fix copying the lru_cache() wrapper object -- https://bugs.python.org/issue25447 +Patch30: Python-3.5.1-fix_lru_cache_copying.patch ### COMMON-PATCH-END ### BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -107,10 +102,10 @@ # the versions are autogenerated from pre_checkin.sh # based on the current source tarball -%define python_version 3.4 +%define python_version 3.5 -%define python_version_abitag 34 -%define python_version_soname 3_4 +%define python_version_abitag 35 +%define python_version_soname 3_5 %define sitedir %{_libdir}/python%{python_version} @@ -124,7 +119,21 @@ %define so_version %{python_version_soname}%{abi_kind}1_0 -%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}.so +# rpm and python have different ideas about what is an arch-dependent name, so: +%if %{__isa_name} == ppc +%define archname %(echo %{_arch} | sed s/ppc/powerpc/) +%else +%define archname %{_arch} +%endif +# our arm has Hardware-Floatingpoint +%if %{_arch} == arm +%define armsuffix hf +%endif + +# pyexpat.cpython-35m-x86_64-linux-gnu +# pyexpat.cpython-35m-powerpc64le-linux-gnu +# pyexpat.cpython-35m-armv7-linux-gnueabihf +%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so ### COMMON-DEF-END ### %description @@ -222,13 +231,9 @@ %patch09 -p1 %patch12 -p1 %patch15 -p1 -%patch17 -p1 -%patch18 -p1 %patch19 -p1 %patch20 -p1 -%patch21 -p1 - -cp %{SOURCE11} Lib/test/ +%patch30 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -457,6 +462,7 @@ %{dynlib _testbuffer} %{dynlib _testcapi} %{dynlib _testimportmultiple} +%{dynlib _testmultiphase} %{dynlib xxlimited} # workaround for missing packages %dir %{sitedir}/sqlite3 @@ -525,7 +531,6 @@ %{dynlib _struct} %{dynlib syslog} %{dynlib termios} -%{dynlib time} %{dynlib unicodedata} %{dynlib zlib} # hashlib fallback modules ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.flfLGD/_old 2016-03-14 09:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.flfLGD/_new 2016-03-14 09:57:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-doc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,17 @@ Url: http://www.python.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: xz -Summary: Additional Package Documentation for Python +Summary: Additional Package Documentation for Python 3 License: Python-2.0 Group: Development/Languages/Python -Version: 3.4.3 +Version: 3.5.1 Release: 0 BuildArch: noarch %define tarversion %{version} %define tarname Python-%{tarversion} Source0: http://www.python.org/ftp/python/%{tarversion}/%{tarname}.tar.xz -Source11: dh2048.pem -BuildRequires: python-Sphinx +BuildRequires: python-Sphinx >= 1.2 +BuildRequires: libqt5-qttools # for consistency: ### COMMON-PATCH-BEGIN ### @@ -38,7 +38,7 @@ # implement "--record-rpm" option for distutils installations Patch01: Python-3.0b1-record-rpm.patch # support lib-vs-lib64 distinction -Patch02: Python-3.3.0b2-multilib.patch +Patch02: Python-3.5.0-multilib.patch # securing usage of readlink/realpath in PySys_SetArgv Patch03: python-2.6b1-canonicalize2.patch # support finding packages in /usr/local, install to /usr/local by default @@ -53,25 +53,21 @@ Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch # Raise timeout value for test_subprocess Patch15: subprocess-raise-timeout.patch -# Upstream patch for bogus faulthandler which fails with GCC 5 -Patch17: python-3.4.1-fix-faulthandler.patch -# PATCH-FIX-UPSTREAM require SSL conditionally in test_urllib -Patch18: python-3.4.3-test-conditional-ssl.patch # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch19: python-2.7-libffi-aarch64.patch -# PATCH-FIX-OPENSUSE python-fix-short-dh.patch replace too short dh parameters by 2048bit one -Patch20: python-fix-short-dh.patch # PATCH-FIX-UPSTREAM python3-ncurses-6.0-accessors.patch [email protected] -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 -Patch21: python3-ncurses-6.0-accessors.patch +Patch20: python3-ncurses-6.0-accessors.patch +# PATCH-FIX-UPSTREAM Python-3.5.1-fix_lru_cache_copying.patch -- Fix copying the lru_cache() wrapper object -- https://bugs.python.org/issue25447 +Patch30: Python-3.5.1-fix_lru_cache_copying.patch ### COMMON-PATCH-END ### ### COMMON-DEF-BEGIN ### # the versions are autogenerated from pre_checkin.sh # based on the current source tarball -%define python_version 3.4 +%define python_version 3.5 -%define python_version_abitag 34 -%define python_version_soname 3_4 +%define python_version_abitag 35 +%define python_version_soname 3_5 %define sitedir %{_libdir}/python%{python_version} @@ -85,7 +81,21 @@ %define so_version %{python_version_soname}%{abi_kind}1_0 -%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}.so +# rpm and python have different ideas about what is an arch-dependent name, so: +%if %{__isa_name} == ppc +%define archname %(echo %{_arch} | sed s/ppc/powerpc/) +%else +%define archname %{_arch} +%endif +# our arm has Hardware-Floatingpoint +%if %{_arch} == arm +%define armsuffix hf +%endif + +# pyexpat.cpython-35m-x86_64-linux-gnu +# pyexpat.cpython-35m-powerpc64le-linux-gnu +# pyexpat.cpython-35m-armv7-linux-gnueabihf +%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so ### COMMON-DEF-END ### Enhances: python3 = %{python_version} @@ -112,13 +122,9 @@ %patch09 -p1 %patch12 -p1 %patch15 -p1 -%patch17 -p1 -%patch18 -p1 %patch19 -p1 %patch20 -p1 -%patch21 -p1 - -cp %{SOURCE11} Lib/test/ +%patch30 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -140,6 +146,10 @@ cd Doc sed -i "s/^today = .*/today = '$TODAY_DATE'/" conf.py make html +# create a .qch file that can be used in QtAssistant or KDevelop +sphinx-build -a -b qthelp . build/qthelp +qhelpgenerator-qt5 build/qthelp/Python.qhp -o build/qthelp/Python.qch + %install export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/python3 @@ -147,6 +157,7 @@ # generated docs rm Doc/build/html/.buildinfo cp -r Doc/build/html $PDOCS +install -m 644 Doc/build/qthelp/Python.qch $PDOCS # misc install -d -m 755 $PDOCS/Misc rm Misc/README.AIX @@ -162,5 +173,6 @@ %dir %{_docdir}/python3 %doc %{_docdir}/python3/Misc %doc %{_docdir}/python3/html +%doc %{_docdir}/python3/Python.qch %changelog ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.flfLGD/_old 2016-03-14 09:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.flfLGD/_new 2016-03-14 09:57:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,10 +37,10 @@ BuildRequires: xz BuildRequires: pkgconfig(x11) Url: http://www.python.org/ -Summary: Python3 Interpreter +Summary: Python 3 Interpreter License: Python-2.0 Group: Development/Languages/Python -Version: 3.4.3 +Version: 3.5.1 Release: 0 %define tarversion %{version} %define tarname Python-%{tarversion} @@ -56,7 +56,6 @@ Source1: baselibs.conf Source2: python3-rpmlintrc #Source11: testfiles.tar.bz2 -Source11: dh2048.pem # issues with copyrighted Unicode testing files # do not add patches here, please edit python3-base.spec instead @@ -69,7 +68,7 @@ # implement "--record-rpm" option for distutils installations Patch01: Python-3.0b1-record-rpm.patch # support lib-vs-lib64 distinction -Patch02: Python-3.3.0b2-multilib.patch +Patch02: Python-3.5.0-multilib.patch # securing usage of readlink/realpath in PySys_SetArgv Patch03: python-2.6b1-canonicalize2.patch # support finding packages in /usr/local, install to /usr/local by default @@ -84,16 +83,12 @@ Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch # Raise timeout value for test_subprocess Patch15: subprocess-raise-timeout.patch -# Upstream patch for bogus faulthandler which fails with GCC 5 -Patch17: python-3.4.1-fix-faulthandler.patch -# PATCH-FIX-UPSTREAM require SSL conditionally in test_urllib -Patch18: python-3.4.3-test-conditional-ssl.patch # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch19: python-2.7-libffi-aarch64.patch -# PATCH-FIX-OPENSUSE python-fix-short-dh.patch replace too short dh parameters by 2048bit one -Patch20: python-fix-short-dh.patch # PATCH-FIX-UPSTREAM python3-ncurses-6.0-accessors.patch [email protected] -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 -Patch21: python3-ncurses-6.0-accessors.patch +Patch20: python3-ncurses-6.0-accessors.patch +# PATCH-FIX-UPSTREAM Python-3.5.1-fix_lru_cache_copying.patch -- Fix copying the lru_cache() wrapper object -- https://bugs.python.org/issue25447 +Patch30: Python-3.5.1-fix_lru_cache_copying.patch ### COMMON-PATCH-END ### BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -107,10 +102,10 @@ # the versions are autogenerated from pre_checkin.sh # based on the current source tarball -%define python_version 3.4 +%define python_version 3.5 -%define python_version_abitag 34 -%define python_version_soname 3_4 +%define python_version_abitag 35 +%define python_version_soname 3_5 %define sitedir %{_libdir}/python%{python_version} @@ -124,7 +119,21 @@ %define so_version %{python_version_soname}%{abi_kind}1_0 -%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}.so +# rpm and python have different ideas about what is an arch-dependent name, so: +%if %{__isa_name} == ppc +%define archname %(echo %{_arch} | sed s/ppc/powerpc/) +%else +%define archname %{_arch} +%endif +# our arm has Hardware-Floatingpoint +%if %{_arch} == arm +%define armsuffix hf +%endif + +# pyexpat.cpython-35m-x86_64-linux-gnu +# pyexpat.cpython-35m-powerpc64le-linux-gnu +# pyexpat.cpython-35m-armv7-linux-gnueabihf +%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so ### COMMON-DEF-END ### # some compatibility Provides @@ -194,13 +203,9 @@ %patch09 -p1 %patch12 -p1 %patch15 -p1 -%patch17 -p1 -%patch18 -p1 %patch19 -p1 %patch20 -p1 -%patch21 -p1 - -cp %{SOURCE11} Lib/test/ +%patch30 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -246,12 +251,17 @@ fi # only test the parts skipped in python3-base -TESTS="test_dbm_gnu test_dbm_ndbm test_readline test_ssl test_tcl test_tk test_ttk_guionly test_ttk_textonly test_curses test_socketserver test_sqlite test_hashlib test_smtpnet test_urllib test_httplib test_imaplib test_ftplib test_asyncio test_urllib2_localnet test_nntplib" +TESTS="test_curses test_dbm_gnu test_dbm_ndbm test_idle \ + test_readline test_sqlite test_ssl test_tcl \ + test_ttk_textonly" +# redo tests with SSL parts +TESTS="$TESTS test_asyncio test_hashlib test_urllib test_httplib \ + test_imaplib test_ftplib test_urllib2_localnet test_nntplib" # ensurepip-based tests TESTS="$TESTS test_venv test_ensurepip test_tools" -make test TESTOPTS="-u none $TESTS" +make test TESTOPTS="-u curses $TESTS" %install make \ @@ -287,8 +297,8 @@ _ctypes _datetime _decimal _elementtree fcntl grp _heapq _json _lsprof \ _lzma math mmap _multibytecodec _multiprocessing nis _opcode ossaudiodev \ parser _pickle _posixsubprocess _random resource select _socket spwd \ - _struct syslog termios _testbuffer _testimportmultiple time unicodedata zlib \ - _ctypes_test _testcapi xxlimited \ + _struct syslog termios _testbuffer _testimportmultiple _testmultiphase \ + unicodedata zlib _ctypes_test _testcapi xxlimited \ _md5 _sha1 _sha256 _sha512 do eval rm "$RPM_BUILD_ROOT%{sitedir}/lib-dynload/$library.*" ++++++ Python-3.3.0b2-multilib.patch -> Python-3.5.0-multilib.patch ++++++ --- /work/SRC/openSUSE:Factory/python3/Python-3.3.0b2-multilib.patch 2015-05-16 07:13:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/Python-3.5.0-multilib.patch 2016-03-14 09:57:01.000000000 +0100 @@ -1,21 +1,8 @@ -Index: Python-3.4.3/Include/pythonrun.h +Index: Python-3.5.0/Lib/distutils/command/install.py =================================================================== ---- Python-3.4.3.orig/Include/pythonrun.h 2015-05-13 16:46:55.851521859 +0200 -+++ Python-3.4.3/Include/pythonrun.h 2015-05-13 16:46:57.157528715 +0200 -@@ -220,6 +220,8 @@ - /* In their own files */ - PyAPI_FUNC(const char *) Py_GetVersion(void); - PyAPI_FUNC(const char *) Py_GetPlatform(void); -+PyAPI_FUNC(const char *) Py_GetArch(void); -+PyAPI_FUNC(const char *) Py_GetLib(void); - PyAPI_FUNC(const char *) Py_GetCopyright(void); - PyAPI_FUNC(const char *) Py_GetCompiler(void); - PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-3.4.3/Lib/distutils/command/install.py -=================================================================== ---- Python-3.4.3.orig/Lib/distutils/command/install.py 2015-05-13 16:46:55.852521864 +0200 -+++ Python-3.4.3/Lib/distutils/command/install.py 2015-05-13 16:48:05.857889431 +0200 -@@ -30,7 +30,7 @@ +--- Python-3.5.0.orig/Lib/distutils/command/install.py ++++ Python-3.5.0/Lib/distutils/command/install.py +@@ -30,7 +30,7 @@ WINDOWS_SCHEME = { INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', @@ -24,11 +11,11 @@ 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-3.4.3/Lib/distutils/sysconfig.py +Index: Python-3.5.0/Lib/distutils/sysconfig.py =================================================================== ---- Python-3.4.3.orig/Lib/distutils/sysconfig.py 2015-05-13 16:46:55.853521870 +0200 -+++ Python-3.4.3/Lib/distutils/sysconfig.py 2015-05-13 16:46:57.158528720 +0200 -@@ -141,8 +141,11 @@ +--- Python-3.5.0.orig/Lib/distutils/sysconfig.py ++++ Python-3.5.0/Lib/distutils/sysconfig.py +@@ -132,8 +132,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -42,11 +29,11 @@ if standard_lib: return libpython else: -Index: Python-3.4.3/Lib/pydoc.py +Index: Python-3.5.0/Lib/pydoc.py =================================================================== ---- Python-3.4.3.orig/Lib/pydoc.py 2015-05-13 16:46:55.853521870 +0200 -+++ Python-3.4.3/Lib/pydoc.py 2015-05-13 16:46:57.158528720 +0200 -@@ -394,7 +394,7 @@ +--- Python-3.5.0.orig/Lib/pydoc.py ++++ Python-3.5.0/Lib/pydoc.py +@@ -393,7 +393,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) @@ -55,11 +42,11 @@ "python%d.%d" % sys.version_info[:2]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-3.4.3/Lib/site.py +Index: Python-3.5.0/Lib/site.py =================================================================== ---- Python-3.4.3.orig/Lib/site.py 2015-05-13 16:46:55.854521875 +0200 -+++ Python-3.4.3/Lib/site.py 2015-05-13 16:46:57.159528726 +0200 -@@ -247,28 +247,37 @@ +--- Python-3.5.0.orig/Lib/site.py ++++ Python-3.5.0/Lib/site.py +@@ -247,28 +247,37 @@ def getuserbase(): USER_BASE = get_config_var('userbase') return USER_BASE @@ -103,7 +90,7 @@ def addusersitepackages(known_paths): """Add a per user site-package to sys.path -@@ -278,10 +287,12 @@ +@@ -278,10 +287,12 @@ def addusersitepackages(known_paths): """ # get the per user site-package path # this call will also make sure USER_BASE and USER_SITE are set @@ -119,7 +106,7 @@ return known_paths def getsitepackages(prefixes=None): -@@ -304,13 +315,19 @@ +@@ -303,12 +314,16 @@ def getsitepackages(prefixes=None): seen.add(prefix) if os.sep == '/': @@ -131,10 +118,6 @@ + sitepackages.append(os.path.join(prefix, "lib", "python" + sys.version[:3], "site-packages")) -- sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) -+ if sys.lib != "lib": -+ sitepackages.append(os.path.join(prefix, "lib", "site-python")) else: sitepackages.append(prefix) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) @@ -142,11 +125,11 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-3.4.3/Lib/trace.py +Index: Python-3.5.0/Lib/trace.py =================================================================== ---- Python-3.4.3.orig/Lib/trace.py 2015-05-13 16:46:55.854521875 +0200 -+++ Python-3.4.3/Lib/trace.py 2015-05-13 16:46:57.159528726 +0200 -@@ -751,10 +751,10 @@ +--- Python-3.5.0.orig/Lib/trace.py ++++ Python-3.5.0/Lib/trace.py +@@ -749,10 +749,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -159,11 +142,11 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-3.4.3/Makefile.pre.in +Index: Python-3.5.0/Makefile.pre.in =================================================================== ---- Python-3.4.3.orig/Makefile.pre.in 2015-05-13 16:46:55.855521880 +0200 -+++ Python-3.4.3/Makefile.pre.in 2015-05-13 16:46:57.160528731 +0200 -@@ -101,6 +101,8 @@ +--- Python-3.5.0.orig/Makefile.pre.in ++++ Python-3.5.0/Makefile.pre.in +@@ -101,6 +101,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -172,7 +155,7 @@ # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -120,7 +122,7 @@ +@@ -120,7 +122,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -181,15 +164,15 @@ ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -711,6 +713,7 @@ +@@ -727,6 +729,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ + -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \ -o $@ $(srcdir)/Modules/getpath.c - Modules/python.o: $(srcdir)/Modules/python.c -@@ -779,7 +782,7 @@ + Programs/python.o: $(srcdir)/Programs/python.c +@@ -796,7 +799,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(O Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -198,10 +181,10 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-3.4.3/Modules/getpath.c +Index: Python-3.5.0/Modules/getpath.c =================================================================== ---- Python-3.4.3.orig/Modules/getpath.c 2015-05-13 16:46:55.856521885 +0200 -+++ Python-3.4.3/Modules/getpath.c 2015-05-13 16:46:57.160528731 +0200 +--- Python-3.5.0.orig/Modules/getpath.c ++++ Python-3.5.0/Modules/getpath.c @@ -117,9 +117,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -216,20 +199,20 @@ #endif #ifndef LANDMARK -@@ -494,7 +496,7 @@ - _pythonpath = _Py_char2wchar(PYTHONPATH, NULL); - _prefix = _Py_char2wchar(PREFIX, NULL); - _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL); -- lib_python = _Py_char2wchar("lib/python" VERSION, NULL); -+ lib_python = _Py_char2wchar(LIB_PYTHON, NULL); +@@ -511,7 +513,7 @@ calculate_path(void) + _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL); + _prefix = Py_DecodeLocale(PREFIX, NULL); + _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL); +- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL); ++ lib_python = Py_DecodeLocale(LIB_PYTHON, NULL); if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { Py_FatalError( -Index: Python-3.4.3/Python/getplatform.c +Index: Python-3.5.0/Python/getplatform.c =================================================================== ---- Python-3.4.3.orig/Python/getplatform.c 2015-05-13 16:46:55.856521885 +0200 -+++ Python-3.4.3/Python/getplatform.c 2015-05-13 16:46:57.160528731 +0200 -@@ -10,3 +10,23 @@ +--- Python-3.5.0.orig/Python/getplatform.c ++++ Python-3.5.0/Python/getplatform.c +@@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; } @@ -253,11 +236,11 @@ +{ + return LIB; +} -Index: Python-3.4.3/Python/sysmodule.c +Index: Python-3.5.0/Python/sysmodule.c =================================================================== ---- Python-3.4.3.orig/Python/sysmodule.c 2015-05-13 16:46:55.857521891 +0200 -+++ Python-3.4.3/Python/sysmodule.c 2015-05-13 16:46:57.161528736 +0200 -@@ -1702,6 +1702,10 @@ +--- Python-3.5.0.orig/Python/sysmodule.c ++++ Python-3.5.0/Python/sysmodule.c +@@ -1767,6 +1767,10 @@ _PySys_Init(void) PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); @@ -268,11 +251,11 @@ SET_SYS_FROM_STRING("executable", PyUnicode_FromWideChar( Py_GetProgramFullPath(), -1)); -Index: Python-3.4.3/setup.py +Index: Python-3.5.0/setup.py =================================================================== ---- Python-3.4.3.orig/setup.py 2015-05-13 16:46:55.858521896 +0200 -+++ Python-3.4.3/setup.py 2015-05-13 16:46:57.161528736 +0200 -@@ -451,7 +451,7 @@ +--- Python-3.5.0.orig/setup.py ++++ Python-3.5.0/setup.py +@@ -469,7 +469,7 @@ class PyBuildExt(build_ext): # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -281,7 +264,7 @@ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: -@@ -508,8 +508,7 @@ +@@ -526,8 +526,7 @@ class PyBuildExt(build_ext): # be assumed that no additional -I,-L directives are needed. if not cross_compiling: lib_dirs = self.compiler.library_dirs + [ @@ -291,7 +274,7 @@ ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] else: -@@ -730,11 +729,11 @@ +@@ -750,11 +749,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -305,7 +288,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1750,18 +1749,17 @@ +@@ -1770,18 +1769,17 @@ class PyBuildExt(build_ext): # Check for various platform-specific directories if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include') @@ -328,11 +311,11 @@ # If Cygwin, then verify that X is installed before proceeding if host_platform == 'cygwin': -Index: Python-3.4.3/Lib/sysconfig.py +Index: Python-3.5.0/Lib/sysconfig.py =================================================================== ---- Python-3.4.3.orig/Lib/sysconfig.py 2015-05-13 16:46:55.858521896 +0200 -+++ Python-3.4.3/Lib/sysconfig.py 2015-05-13 16:46:57.162528741 +0200 -@@ -20,10 +20,10 @@ +--- Python-3.5.0.orig/Lib/sysconfig.py ++++ Python-3.5.0/Lib/sysconfig.py +@@ -20,10 +20,10 @@ __all__ = [ _INSTALL_SCHEMES = { 'posix_prefix': { @@ -346,7 +329,7 @@ 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': -@@ -61,10 +61,10 @@ +@@ -61,10 +61,10 @@ _INSTALL_SCHEMES = { 'data': '{userbase}', }, 'posix_user': { @@ -360,13 +343,13 @@ 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', -Index: Python-3.4.3/configure.ac +Index: Python-3.5.0/configure.ac =================================================================== ---- Python-3.4.3.orig/configure.ac 2015-05-13 16:46:55.859521901 +0200 -+++ Python-3.4.3/configure.ac 2015-05-13 16:46:57.163528747 +0200 -@@ -791,6 +791,41 @@ - MULTIARCH=$($CC --print-multiarch 2>/dev/null) - AC_SUBST(MULTIARCH) +--- Python-3.5.0.orig/configure.ac ++++ Python-3.5.0/configure.ac +@@ -858,6 +858,41 @@ PLATDIR=plat-$MACHDEP + AC_SUBST(PLATDIR) + AC_SUBST(PLATFORM_TRIPLET) +AC_SUBST(ARCH) +AC_MSG_CHECKING(ARCH) @@ -404,5 +387,27 @@ +esac +AC_MSG_RESULT($LIB) - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) + AC_MSG_CHECKING([for -Wl,--no-as-needed]) + save_LDFLAGS="$LDFLAGS" +@@ -4331,7 +4366,7 @@ AC_MSG_RESULT($LDVERSION) + + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. + AC_SUBST(PY_ENABLE_SHARED) +-LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" ++LIBPL='$(prefix)'"/${LIB}/python${VERSION}/config-${LDVERSION}" + AC_SUBST(LIBPL) + + # Check whether right shifting a negative integer extends the sign bit +Index: Python-3.5.0/Include/pylifecycle.h +=================================================================== +--- Python-3.5.0.orig/Include/pylifecycle.h ++++ Python-3.5.0/Include/pylifecycle.h +@@ -65,6 +65,8 @@ int _Py_CheckPython3(); + /* In their own files */ + PyAPI_FUNC(const char *) Py_GetVersion(void); + PyAPI_FUNC(const char *) Py_GetPlatform(void); ++PyAPI_FUNC(const char *) Py_GetArch(void); ++PyAPI_FUNC(const char *) Py_GetLib(void); + PyAPI_FUNC(const char *) Py_GetCopyright(void); + PyAPI_FUNC(const char *) Py_GetCompiler(void); + PyAPI_FUNC(const char *) Py_GetBuildInfo(void); ++++++ Python-3.5.1-fix_lru_cache_copying.patch ++++++ # HG changeset patch # User Serhiy Storchaka <[email protected]> # Date 1451339887 -7200 # Node ID 33b428ef34b9c1091c190a68c4c89ca828e2d2f4 # Parent 003f1f60a09ccf08e329716dd5241af84fe4b018 Issue #25447: Copying the lru_cache() wrapper object now always works, independedly from the type of the wrapped object (by returning the original object unchanged). diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py --- a/Lib/test/test_functools.py +++ b/Lib/test/test_functools.py @@ -1262,14 +1262,24 @@ class TestLRU: def test_copy(self): cls = self.__class__ - for f in cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth: + def orig(x, y): + return 3 * x + y + part = self.module.partial(orig, 2) + funcs = (cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth, + self.module.lru_cache(2)(part)) + for f in funcs: with self.subTest(func=f): f_copy = copy.copy(f) self.assertIs(f_copy, f) def test_deepcopy(self): cls = self.__class__ - for f in cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth: + def orig(x, y): + return 3 * x + y + part = self.module.partial(orig, 2) + funcs = (cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth, + self.module.lru_cache(2)(part)) + for f in funcs: with self.subTest(func=f): f_copy = copy.deepcopy(f) self.assertIs(f_copy, f) diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -1053,6 +1053,20 @@ lru_cache_reduce(PyObject *self, PyObjec return PyObject_GetAttrString(self, "__qualname__"); } +static PyObject * +lru_cache_copy(PyObject *self, PyObject *unused) +{ + Py_INCREF(self); + return self; +} + +static PyObject * +lru_cache_deepcopy(PyObject *self, PyObject *unused) +{ + Py_INCREF(self); + return self; +} + static int lru_cache_tp_traverse(lru_cache_object *self, visitproc visit, void *arg) { @@ -1104,6 +1118,8 @@ static PyMethodDef lru_cache_methods[] = {"cache_info", (PyCFunction)lru_cache_cache_info, METH_NOARGS}, {"cache_clear", (PyCFunction)lru_cache_cache_clear, METH_NOARGS}, {"__reduce__", (PyCFunction)lru_cache_reduce, METH_NOARGS}, + {"__copy__", (PyCFunction)lru_cache_copy, METH_VARARGS}, + {"__deepcopy__", (PyCFunction)lru_cache_deepcopy, METH_VARARGS}, {NULL} }; ++++++ Python-3.4.3.tar.xz -> Python-3.5.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/python3/Python-3.4.3.tar.xz /work/SRC/openSUSE:Factory/.python3.new/Python-3.5.1.tar.xz differ: char 25, line 1 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.flfLGD/_old 2016-03-14 09:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.flfLGD/_new 2016-03-14 09:57:04.000000000 +0100 @@ -1,3 +1,3 @@ python3 python3-base -libpython3_4m1_0 +libpython3_5m1_0 ++++++ import_failed.map ++++++ --- /var/tmp/diff_new_pack.flfLGD/_old 2016-03-14 09:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.flfLGD/_new 2016-03-14 09:57:04.000000000 +0100 @@ -1,6 +1,6 @@ python3-tools: turtledemo python3-idle: idlelib -python3-testsuite: test _ctypes_test _testbuffer _testcapi _testimportmultiple xxlimited +python3-testsuite: test _ctypes_test _testbuffer _testcapi _testimportmultiple _testmultiphase xxlimited python3-tk: tkinter _tkinter python3-curses: curses _curses _curses_panel python3-dbm: dbm _dbm _gdbm ++++++ python-3.3.0b1-localpath.patch ++++++ --- /var/tmp/diff_new_pack.flfLGD/_old 2016-03-14 09:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.flfLGD/_new 2016-03-14 09:57:04.000000000 +0100 @@ -1,8 +1,8 @@ Index: Lib/site.py =================================================================== ---- Lib/site.py.orig 2013-12-20 12:06:39.163304471 +0100 -+++ Lib/site.py 2013-12-20 12:06:39.171304514 +0100 -@@ -74,7 +74,7 @@ +--- Lib/site.py.orig ++++ Lib/site.py +@@ -74,7 +74,7 @@ import builtins import _sitebuiltins # Prefixes for site-packages; add additional prefixes like /usr/local here @@ -13,20 +13,18 @@ ENABLE_USER_SITE = None Index: Lib/test/test_site.py =================================================================== ---- Lib/test/test_site.py.orig 2013-11-24 21:36:55.000000000 +0100 -+++ Lib/test/test_site.py 2013-12-20 12:06:39.171304514 +0100 -@@ -244,12 +244,27 @@ - self.assertEqual(dirs[2], wanted) +--- Lib/test/test_site.py.orig ++++ Lib/test/test_site.py +@@ -243,10 +243,19 @@ class HelperFunctionsTests(unittest.Test + self.assertEqual(dirs[1], wanted) elif os.sep == '/': # OS X non-framwework builds, Linux, FreeBSD, etc -- self.assertEqual(len(dirs), 2) +- self.assertEqual(len(dirs), 1) - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], + i = 0 + wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3], 'site-packages') - self.assertEqual(dirs[0], wanted) -- wanted = os.path.join('xoxo', 'lib', 'site-python') -- self.assertEqual(dirs[1], wanted) + self.assertEqual(dirs[i], wanted) + i += 1 + if sys.lib != 'lib': @@ -35,15 +33,7 @@ + self.assertEqual(dirs[i], wanted) + i += 1 + -+ wanted = os.path.join('xoxo', sys.lib, 'site-python') -+ self.assertEqual(dirs[i], wanted) -+ i += 1 -+ if sys.lib != 'lib': -+ wanted = os.path.join('xoxo', 'lib', 'site-python') -+ self.assertEqual(dirs[i], wanted) -+ i += 1 -+ -+ self.assertTrue(i in [2,4]) ++ self.assertTrue(i in (1,2)) + self.assertEqual(len(dirs), i) else: # other platforms ++++++ python3-ncurses-6.0-accessors.patch ++++++ --- /var/tmp/diff_new_pack.flfLGD/_old 2016-03-14 09:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.flfLGD/_new 2016-03-14 09:57:04.000000000 +0100 @@ -1,8 +1,8 @@ -Index: Python-3.4.3/Modules/_cursesmodule.c +Index: Python-3.5.0/Modules/_cursesmodule.c =================================================================== ---- Python-3.4.3.orig/Modules/_cursesmodule.c -+++ Python-3.4.3/Modules/_cursesmodule.c -@@ -1133,7 +1133,7 @@ PyCursesWindow_EchoChar(PyCursesWindowOb +--- Python-3.5.0.orig/Modules/_cursesmodule.c ++++ Python-3.5.0/Modules/_cursesmodule.c +@@ -1070,7 +1070,7 @@ PyCursesWindow_EchoChar(PyCursesWindowOb return NULL; #ifdef WINDOW_HAS_FLAGS @@ -11,7 +11,7 @@ return PyCursesCheckERR(pechochar(self->win, ch | attr), "echochar"); else -@@ -1656,7 +1656,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind +@@ -1593,7 +1593,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind #ifndef WINDOW_HAS_FLAGS if (0) #else @@ -20,7 +20,7 @@ #endif { switch(PyTuple_Size(args)) { -@@ -1831,7 +1831,7 @@ PyCursesWindow_Refresh(PyCursesWindowObj +@@ -1768,7 +1768,7 @@ PyCursesWindow_Refresh(PyCursesWindowObj #ifndef WINDOW_HAS_FLAGS if (0) #else @@ -29,7 +29,7 @@ #endif { switch(PyTuple_Size(args)) { -@@ -1898,7 +1898,7 @@ PyCursesWindow_SubWin(PyCursesWindowObje +@@ -1835,7 +1835,7 @@ PyCursesWindow_SubWin(PyCursesWindowObje /* printf("Subwin: %i %i %i %i \n", nlines, ncols, begin_y, begin_x); */ #ifdef WINDOW_HAS_FLAGS
