On Mon, 27 Jun 2011 20:54:39 +0200, Remi Pointel wrote:
Hello,
I have worked on porting Python 3.2 (with jasper@ and Henry Precheur,
thanks).
It has been imported because having it intree will allow more people
to work on it.
Now, this port needs a lot of work to be linked to the build, so
please test and report problems you could have.
Thanks for your help.
Regards,
Hello,
Python 3.2.1 have been released.
Attached is the diff to update Python 3.2 to Python 3.2.1.
Could you test the diff and make regress on arch != amd64 and sparc64,
and send me the results please.
Thanks a lot,
Remi.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python3/Makefile.inc,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.inc
--- Makefile.inc 29 Jun 2011 11:58:31 -0000 1.2
+++ Makefile.inc 11 Jul 2011 19:20:08 -0000
@@ -8,21 +8,17 @@
SHARED_ONLY= Yes
COMMENT-main= interpreted object-oriented programming language
-#COMMENT-bsddb= Berkeley db module for Python
COMMENT-gdbm= GNU dbm module for Python
COMMENT-idle= IDE for Python
COMMENT-tests= Python test suite
COMMENT-tkinter=tk GUI module for Python
-#COMMENT-tools= extra tools for Python
DISTNAME= Python-${VERSION}${PATCHLEVEL}
PKGNAME-main= python3-${VERSION}${PATCHLEVEL}
-#PKGNAME-bsddb= python3-bsddb-${VERSION}${PATCHLEVEL}
PKGNAME-gdbm= python3-gdbm-${VERSION}${PATCHLEVEL}
PKGNAME-idle= python3-idle-${VERSION}${PATCHLEVEL}
PKGNAME-tests= python3-tests-${VERSION}${PATCHLEVEL}
PKGNAME-tkinter=python3-tkinter-${VERSION}${PATCHLEVEL}
-#PKGNAME-tools= python3-tools-${VERSION}${PATCHLEVEL}
CATEGORIES= lang
MASTER_SITES= http://www.python.org/ftp/${PSUBDIR}/ \
http://python.mirrors.pair.com/pub/${PSUBDIR}/
@@ -40,7 +36,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-#MULTI_PACKAGES= -main -tests -tools -gdbm -idle -tkinter -bsddb
MULTI_PACKAGES= -main -tests -gdbm -idle -tkinter
# Python 2.6 lists BSD db 4.6.x as unstable on most architectures (see
@@ -58,14 +53,10 @@ LIB_DEPENDS-main = archivers/bzip2
RUN_DEPENDS-main =
WANTLIB-main = ssl panelw m crypto c util z readline pthread \
ncursesw stdc++ expat bz2 ffi
-#.if ${VERSION} == "2.5" || ${VERSION} == "2.6" || ${VERSION} == "2.7"
LIB_DEPENDS-main += databases/sqlite3 \
devel/libffi
WANTLIB-main += sqlite3
-#.endif
-#LIB_DEPENDS-bsddb = databases/db/v4
-#WANTLIB-bsddb = lib/db4/db>=4
LIB_DEPENDS-gdbm = databases/gdbm \
lang/python3/${VERSION},-main
WANTLIB-gdbm = gdbm>=3 python${VERSION}m
Index: 3.2/Makefile
===================================================================
RCS file: /cvs/ports/lang/python3/3.2/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- 3.2/Makefile 29 Jun 2011 11:58:31 -0000 1.2
+++ 3.2/Makefile 11 Jul 2011 19:20:08 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.2 2011/06/29 11:58:31 rpointel Exp $
VERSION = 3.2
-#PATCHLEVEL = .1
+PATCHLEVEL = .1
SHARED_LIBS = python3.2m 1.0
AUTOCONF_VERSION = 2.68
Index: 3.2/distinfo
===================================================================
RCS file: /cvs/ports/lang/python3/3.2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- 3.2/distinfo 27 Jun 2011 18:44:13 -0000 1.1.1.1
+++ 3.2/distinfo 11 Jul 2011 19:20:08 -0000
@@ -1,5 +1,5 @@
-MD5 (Python-3.2.tgz) = Xv6Dinh4sXD2co1+XXUXrw==
-RMD160 (Python-3.2.tgz) = ZjNunO0jujmUACcImlYYVsdxKIA=
-SHA1 (Python-3.2.tgz) = LAhGV4anDYz5vTKctrC0Sduo+N0=
-SHA256 (Python-3.2.tgz) = J7Nb/LvwHelWTAJl1ytYuj/z1W3wYVdlNy8qoJ3CDak=
-SIZE (Python-3.2.tgz) = 12673043
+MD5 (Python-3.2.1.tgz) = bCqjSBytt733TmJf/8NSsg==
+RMD160 (Python-3.2.1.tgz) = XLNNNndcMqYdrh06Uva+JTk/c0c=
+SHA1 (Python-3.2.1.tgz) = AA/2XbmC+8ZPqVonN6f6Eoc+yTE=
+SHA256 (Python-3.2.1.tgz) = fP8p2YRpbZ/ox76lTaW5rTas7zP/XPDT435NEvshxXI=
+SIZE (Python-3.2.1.tgz) = 12713430
Index: 3.2/patches/patch-Lib_test_test_capi_py
===================================================================
RCS file: 3.2/patches/patch-Lib_test_test_capi_py
diff -N 3.2/patches/patch-Lib_test_test_capi_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 3.2/patches/patch-Lib_test_test_capi_py 11 Jul 2011 19:20:08 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- Lib/test/test_capi.py.orig Sat Jul 9 08:58:50 2011
++++ Lib/test/test_capi.py Mon Jul 11 15:15:28 2011
+@@ -91,6 +91,7 @@
+ if False and support.verbose:
+ print("(%i)"%(len(l),))
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_pendingcalls_threaded(self):
+
+ #do every callback on a separate thread
Index: 3.2/patches/patch-Lib_test_test_io_py
===================================================================
RCS file: 3.2/patches/patch-Lib_test_test_io_py
diff -N 3.2/patches/patch-Lib_test_test_io_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 3.2/patches/patch-Lib_test_test_io_py 11 Jul 2011 19:20:08 -0000
@@ -0,0 +1,44 @@
+$OpenBSD$
+--- Lib/test/test_io.py.orig Sat Jul 9 08:58:50 2011
++++ Lib/test/test_io.py Mon Jul 11 14:13:36 2011
+@@ -2694,12 +2694,15 @@
+ if e.errno != errno.EBADF:
+ raise
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_interrupted_write_unbuffered(self):
+ self.check_interrupted_write(b"xy", b"xy", mode="wb", buffering=0)
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_interrupted_write_buffered(self):
+ self.check_interrupted_write(b"xy", b"xy", mode="wb")
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_interrupted_write_text(self):
+ self.check_interrupted_write("xy", b"xy", mode="w", encoding="ascii")
+
+@@ -2758,10 +2761,12 @@
+ os.close(w)
+ os.close(r)
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_interrupterd_read_retry_buffered(self):
+ self.check_interrupted_read_retry(lambda x: x.decode('latin1'),
+ mode="rb")
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_interrupterd_read_retry_text(self):
+ self.check_interrupted_read_retry(lambda x: x,
+ mode="r")
+@@ -2821,9 +2826,11 @@
+ if e.errno != errno.EBADF:
+ raise
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_interrupterd_write_retry_buffered(self):
+ self.check_interrupted_write_retry(b"x", mode="wb")
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_interrupterd_write_retry_text(self):
+ self.check_interrupted_write_retry("x", mode="w", encoding="latin1")
+
Index: 3.2/patches/patch-Lib_test_test_regrtest_py
===================================================================
RCS file: 3.2/patches/patch-Lib_test_test_regrtest_py
diff -N 3.2/patches/patch-Lib_test_test_regrtest_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 3.2/patches/patch-Lib_test_test_regrtest_py 11 Jul 2011 19:20:08 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Lib_test_regrtest_py,v 1.1.1.1 2011/06/27 18:44:13 rpointel Exp $
+--- Lib/test/regrtest.py.orig Wed Jun 22 14:13:21 2011
++++ Lib/test/regrtest.py Wed Jun 22 14:13:52 2011
+@@ -1433,6 +1433,8 @@ _expectations['freebsd5'] = _expectations['freebsd4']
+ _expectations['freebsd6'] = _expectations['freebsd4']
+ _expectations['freebsd7'] = _expectations['freebsd4']
+ _expectations['freebsd8'] = _expectations['freebsd4']
++_expectations['openbsd4'] = _expectations['openbsd3']
++_expectations['openbsd5'] = _expectations['openbsd3']
+
+ class _ExpectedSkips:
+ def __init__(self):
Index: 3.2/patches/patch-Lib_test_test_socket_py
===================================================================
RCS file: 3.2/patches/patch-Lib_test_test_socket_py
diff -N 3.2/patches/patch-Lib_test_test_socket_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 3.2/patches/patch-Lib_test_test_socket_py 11 Jul 2011 19:20:08 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- Lib/test/test_socket.py.orig Wed Jan 5 22:03:42 2011
++++ Lib/test/test_socket.py Wed Jun 29 15:00:12 2011
+@@ -715,6 +715,7 @@
+ c.close()
+ s.close()
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_sendall_interrupted(self):
+ self.check_sendall_interrupted(False)
+
Index: 3.2/patches/patch-Lib_test_test_subprocess_py
===================================================================
RCS file: 3.2/patches/patch-Lib_test_test_subprocess_py
diff -N 3.2/patches/patch-Lib_test_test_subprocess_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 3.2/patches/patch-Lib_test_test_subprocess_py 11 Jul 2011 19:20:08 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- Lib/test/test_subprocess.py.orig Mon Jan 3 23:24:52 2011
++++ Lib/test/test_subprocess.py Wed Jun 29 15:36:22 2011
+@@ -1189,6 +1189,7 @@
+ close_fds=False, pass_fds=(fd, )))
+ self.assertIn('overriding close_fds', str(context.warning))
+
++ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
+ def test_wait_when_sigchild_ignored(self):
+ # NOTE: sigchild_ignore.py may not be an effective test on all OSes.
+ sigchild_ignore = support.findfile("sigchild_ignore.py",
Index: 3.2/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python3/3.2/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- 3.2/pkg/PLIST-main 28 Jun 2011 09:29:28 -0000 1.2
+++ 3.2/pkg/PLIST-main 11 Jul 2011 19:20:11 -0000
@@ -1005,6 +1005,7 @@ lib/python3.2/distutils/tests/test_uploa
lib/python3.2/distutils/tests/test_util.py
lib/python3.2/distutils/tests/test_version.py
lib/python3.2/distutils/tests/test_versionpredicate.py
+lib/python3.2/distutils/tests/xxmodule.c
lib/python3.2/distutils/text_file.py
lib/python3.2/distutils/unixccompiler.py
lib/python3.2/distutils/util.py
@@ -1724,7 +1725,7 @@ lib/python3.2/json/scanner.py
lib/python3.2/json/tool.py
lib/python3.2/keyword.py
lib/python3.2/lib-dynload/
-lib/python3.2/lib-dynload/Python-3.2-py3.2.egg-info
+lib/python3.2/lib-dynload/Python-3.2.1-py3.2.egg-info
lib/python3.2/lib-dynload/_bisect.so
lib/python3.2/lib-dynload/_codecs_cn.so
lib/python3.2/lib-dynload/_codecs_hk.so
@@ -1779,9 +1780,9 @@ lib/python3.2/lib-dynload/xxlimited.so
lib/python3.2/lib-dynload/zlib.so
lib/python3.2/lib2to3/
lib/python3.2/lib2to3/Grammar.txt
-lib/python3.2/lib2to3/Grammar3.2.0.final.0.pickle
+lib/python3.2/lib2to3/Grammar3.2.1.final.0.pickle
lib/python3.2/lib2to3/PatternGrammar.txt
-lib/python3.2/lib2to3/PatternGrammar3.2.0.final.0.pickle
+lib/python3.2/lib2to3/PatternGrammar3.2.1.final.0.pickle
lib/python3.2/lib2to3/__init__.py
lib/python3.2/lib2to3/__pycache__/
lib/python3.2/lib2to3/__pycache__/__init__.cpython-32.pyc
Index: 3.2/pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python3/3.2/pkg/PLIST-tests,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-tests
--- 3.2/pkg/PLIST-tests 27 Jun 2011 18:44:15 -0000 1.1.1.1
+++ 3.2/pkg/PLIST-tests 11 Jul 2011 19:20:12 -0000
@@ -13,8 +13,6 @@ lib/python3.2/test/__pycache__/autotest.
lib/python3.2/test/__pycache__/autotest.cpython-32.pyo
lib/python3.2/test/__pycache__/buffer_tests.cpython-32.pyc
lib/python3.2/test/__pycache__/buffer_tests.cpython-32.pyo
-lib/python3.2/test/__pycache__/cjkencodings_test.cpython-32.pyc
-lib/python3.2/test/__pycache__/cjkencodings_test.cpython-32.pyo
lib/python3.2/test/__pycache__/curses_tests.cpython-32.pyc
lib/python3.2/test/__pycache__/curses_tests.cpython-32.pyo
lib/python3.2/test/__pycache__/datetimetester.cpython-32.pyc
@@ -163,6 +161,8 @@ lib/python3.2/test/__pycache__/test_code
lib/python3.2/test/__pycache__/test_codecencodings_cn.cpython-32.pyo
lib/python3.2/test/__pycache__/test_codecencodings_hk.cpython-32.pyc
lib/python3.2/test/__pycache__/test_codecencodings_hk.cpython-32.pyo
+lib/python3.2/test/__pycache__/test_codecencodings_iso2022.cpython-32.pyc
+lib/python3.2/test/__pycache__/test_codecencodings_iso2022.cpython-32.pyo
lib/python3.2/test/__pycache__/test_codecencodings_jp.cpython-32.pyc
lib/python3.2/test/__pycache__/test_codecencodings_jp.cpython-32.pyo
lib/python3.2/test/__pycache__/test_codecencodings_kr.cpython-32.pyc
@@ -445,6 +445,8 @@ lib/python3.2/test/__pycache__/test_modu
lib/python3.2/test/__pycache__/test_module.cpython-32.pyo
lib/python3.2/test/__pycache__/test_modulefinder.cpython-32.pyc
lib/python3.2/test/__pycache__/test_modulefinder.cpython-32.pyo
+lib/python3.2/test/__pycache__/test_msilib.cpython-32.pyc
+lib/python3.2/test/__pycache__/test_msilib.cpython-32.pyo
lib/python3.2/test/__pycache__/test_multibytecodec.cpython-32.pyc
lib/python3.2/test/__pycache__/test_multibytecodec.cpython-32.pyo
lib/python3.2/test/__pycache__/test_multibytecodec_support.cpython-32.pyc
@@ -681,6 +683,8 @@ lib/python3.2/test/__pycache__/test_thre
lib/python3.2/test/__pycache__/test_threadsignals.cpython-32.pyo
lib/python3.2/test/__pycache__/test_time.cpython-32.pyc
lib/python3.2/test/__pycache__/test_time.cpython-32.pyo
+lib/python3.2/test/__pycache__/test_timeit.cpython-32.pyc
+lib/python3.2/test/__pycache__/test_timeit.cpython-32.pyo
lib/python3.2/test/__pycache__/test_timeout.cpython-32.pyc
lib/python3.2/test/__pycache__/test_timeout.cpython-32.pyo
lib/python3.2/test/__pycache__/test_tk.cpython-32.pyc
@@ -817,7 +821,37 @@ lib/python3.2/test/cfgparser.1
lib/python3.2/test/cfgparser.2
lib/python3.2/test/cfgparser.3
lib/python3.2/test/check_soundcard.vbs
-lib/python3.2/test/cjkencodings_test.py
+lib/python3.2/test/cjkencodings/
+lib/python3.2/test/cjkencodings/big5-utf8.txt
+lib/python3.2/test/cjkencodings/big5.txt
+lib/python3.2/test/cjkencodings/big5hkscs-utf8.txt
+lib/python3.2/test/cjkencodings/big5hkscs.txt
+lib/python3.2/test/cjkencodings/cp949-utf8.txt
+lib/python3.2/test/cjkencodings/cp949.txt
+lib/python3.2/test/cjkencodings/euc_jisx0213-utf8.txt
+lib/python3.2/test/cjkencodings/euc_jisx0213.txt
+lib/python3.2/test/cjkencodings/euc_jp-utf8.txt
+lib/python3.2/test/cjkencodings/euc_jp.txt
+lib/python3.2/test/cjkencodings/euc_kr-utf8.txt
+lib/python3.2/test/cjkencodings/euc_kr.txt
+lib/python3.2/test/cjkencodings/gb18030-utf8.txt
+lib/python3.2/test/cjkencodings/gb18030.txt
+lib/python3.2/test/cjkencodings/gb2312-utf8.txt
+lib/python3.2/test/cjkencodings/gb2312.txt
+lib/python3.2/test/cjkencodings/gbk-utf8.txt
+lib/python3.2/test/cjkencodings/gbk.txt
+lib/python3.2/test/cjkencodings/hz-utf8.txt
+lib/python3.2/test/cjkencodings/hz.txt
+lib/python3.2/test/cjkencodings/iso2022_jp-utf8.txt
+lib/python3.2/test/cjkencodings/iso2022_jp.txt
+lib/python3.2/test/cjkencodings/iso2022_kr-utf8.txt
+lib/python3.2/test/cjkencodings/iso2022_kr.txt
+lib/python3.2/test/cjkencodings/johab-utf8.txt
+lib/python3.2/test/cjkencodings/johab.txt
+lib/python3.2/test/cjkencodings/shift_jis-utf8.txt
+lib/python3.2/test/cjkencodings/shift_jis.txt
+lib/python3.2/test/cjkencodings/shift_jisx0213-utf8.txt
+lib/python3.2/test/cjkencodings/shift_jisx0213.txt
lib/python3.2/test/cmath_testcases.txt
lib/python3.2/test/curses_tests.py
lib/python3.2/test/datetimetester.py
@@ -1134,6 +1168,7 @@ lib/python3.2/test/test_code.py
lib/python3.2/test/test_codeccallbacks.py
lib/python3.2/test/test_codecencodings_cn.py
lib/python3.2/test/test_codecencodings_hk.py
+lib/python3.2/test/test_codecencodings_iso2022.py
lib/python3.2/test/test_codecencodings_jp.py
lib/python3.2/test/test_codecencodings_kr.py
lib/python3.2/test/test_codecencodings_tw.py
@@ -1280,6 +1315,7 @@ lib/python3.2/test/test_minidom.py
lib/python3.2/test/test_mmap.py
lib/python3.2/test/test_module.py
lib/python3.2/test/test_modulefinder.py
+lib/python3.2/test/test_msilib.py
lib/python3.2/test/test_multibytecodec.py
lib/python3.2/test/test_multibytecodec_support.py
lib/python3.2/test/test_multiprocessing.py
@@ -1398,6 +1434,7 @@ lib/python3.2/test/test_threading.py
lib/python3.2/test/test_threading_local.py
lib/python3.2/test/test_threadsignals.py
lib/python3.2/test/test_time.py
+lib/python3.2/test/test_timeit.py
lib/python3.2/test/test_timeout.py
lib/python3.2/test/test_tk.py
lib/python3.2/test/test_tokenize.py
