Update python33: 3.3.4 --> 3.3.5.

5 files changed, 30 insertions, 50 deletions

diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index e1abfa107d2c..4b6287a0446c 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -335,9 +335,9 @@ PYTHON_PORTVERSION=	${PYTHON_DEFAULT_PORTVERSION}
 
 # Python-3.3
 .if ${PYTHON_VERSION} == "python3.3"
-PYTHON_PORTVERSION?=	3.3.4
+PYTHON_PORTVERSION?=	3.3.5
 PYTHON_PORTSDIR=	${PORTSDIR}/lang/python33
-PYTHON_REL=		334
+PYTHON_REL=		335
 PYTHON_SUFFIX=		33
 PYTHON_VER=		3.3
 .if exists(${PYTHON_CMD}-config) && defined(PORTNAME) && ${PORTNAME} != python33
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index bd01d8c278d9..b4fb363826c6 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		python33
-PORTVERSION=		3.3.4
+PORTVERSION=		3.3.5
 CATEGORIES=		lang python ipv6
 MASTER_SITES=		PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python33/distinfo b/lang/python33/distinfo
index 565cecfffd8d..4c14a7fb0d8c 100644
--- a/lang/python33/distinfo
+++ b/lang/python33/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Python-3.3.4.tar.xz) = c6cc126d91c04e0348882cfbd36d7a844d4e50acc37a3f6a64d67764e3995689
-SIZE (python/Python-3.3.4.tar.xz) = 12087568
+SHA256 (python/Python-3.3.5.tar.xz) = abe99b484434503d8b23be0f243ec27139e743a4798cd71c1dce3cf40e63b6e5
+SIZE (python/Python-3.3.5.tar.xz) = 12116308
diff --git a/lang/python33/files/patch-issue-20695-Lib__test__test_urllibnet.py b/lang/python33/files/patch-issue-20695-Lib__test__test_urllibnet.py
deleted file mode 100644
index b11f7224048b..000000000000
--- a/lang/python33/files/patch-issue-20695-Lib__test__test_urllibnet.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.org>
-# Date 1392869184 18000
-# Node ID c9261cf05db67ec57cf66bee7b2064adef04d550
-# Parent  8d1528dddc7df1002237921d3e2f22cea1cf18d5# Parent  29b1eebecb8ed946e1db8e4bb86310d681cf4a91
-merge 3.2 (#20695)
-
---- ./Lib/test/test_urllibnet.py.orig	2014-03-04 20:56:25.532422505 +1100
-+++ ./Lib/test/test_urllibnet.py	2014-03-04 20:57:48.725949896 +1100
-@@ -103,7 +103,7 @@
-         # Make sure fd returned by fileno is valid.
-         with self.urlopen("http://www.python.org/", timeout=None) as open_url:
-             fd = open_url.fileno()
--            with os.fdopen(fd, encoding='utf-8') as f:
-+            with os.fdopen(fd, 'rb') as f:
-                 self.assertTrue(f.read(), "reading from file created using fd "
-                                           "returned by fileno failed")
- 
-@@ -151,7 +151,7 @@
-         with self.urlretrieve("http://www.python.org/") as (file_location, info):
-             self.assertTrue(os.path.exists(file_location), "file location returned by"
-                             " urlretrieve is not a valid path")
--            with open(file_location, encoding='utf-8') as f:
-+            with open(file_location, 'rb') as f:
-                 self.assertTrue(f.read(), "reading from the file location returned"
-                                 " by urlretrieve failed")
- 
-@@ -161,7 +161,7 @@
-                               support.TESTFN) as (file_location, info):
-             self.assertEqual(file_location, support.TESTFN)
-             self.assertTrue(os.path.exists(file_location))
--            with open(file_location, encoding='utf-8') as f:
-+            with open(file_location, 'rb') as f:
-                 self.assertTrue(f.read(), "reading from temporary file failed")
- 
-     def test_header(self):
-@@ -170,7 +170,7 @@
-             self.assertIsInstance(info, email.message.Message,
-                                   "info is not an instance of email.message.Message")
- 
--    logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png"
-+    logo = "http://www.python.org/static/community_logos/python-logo-master-v3-TM.png"
- 
-     def test_data_header(self):
-         with self.urlretrieve(self.logo) as (file_location, fileheaders):
diff --git a/lang/python33/pkg-plist b/lang/python33/pkg-plist
index 824b5a48409e..e568fd179b8b 100644
--- a/lang/python33/pkg-plist
+++ b/lang/python33/pkg-plist
@@ -1519,6 +1519,13 @@ man/man1/python3.3.1.gz
 %%PYTHON_LIBDIR%%/idlelib/IOBinding.py
 %%PYTHON_LIBDIR%%/idlelib/Icons/folder.gif
 %%PYTHON_LIBDIR%%/idlelib/Icons/idle.icns
+%%PYTHON_LIBDIR%%/idlelib/Icons/idle.ico
+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_16.gif
+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_16.png
+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_32.gif
+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_32.png
+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_48.gif
+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_48.png
 %%PYTHON_LIBDIR%%/idlelib/Icons/minusnode.gif
 %%PYTHON_LIBDIR%%/idlelib/Icons/openfolder.gif
 %%PYTHON_LIBDIR%%/idlelib/Icons/plusnode.gif
@@ -2313,6 +2320,8 @@ man/man1/python3.3.1.gz
 %%PYTHON_LIBDIR%%/test/__pycache__/autotest.cpython-33.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/buffer_tests.cpython-33.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/buffer_tests.cpython-33.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/coding20731.cpython-33.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/coding20731.cpython-33.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/curses_tests.cpython-33.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/curses_tests.cpython-33.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/datetimetester.cpython-33.pyc
@@ -2693,6 +2702,8 @@ man/man1/python3.3.1.gz
 %%PYTHON_LIBDIR%%/test/__pycache__/test_idle.cpython-33.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_imaplib.cpython-33.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_imaplib.cpython-33.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/test_imghdr.cpython-33.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/test_imghdr.cpython-33.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_imp.cpython-33.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_imp.cpython-33.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_import.cpython-33.pyc
@@ -3217,6 +3228,7 @@ man/man1/python3.3.1.gz
 %%PYTHON_LIBDIR%%/test/cjkencodings/shift_jisx0213-utf8.txt
 %%PYTHON_LIBDIR%%/test/cjkencodings/shift_jisx0213.txt
 %%PYTHON_LIBDIR%%/test/cmath_testcases.txt
+%%PYTHON_LIBDIR%%/test/coding20731.py
 %%PYTHON_LIBDIR%%/test/curses_tests.py
 %%PYTHON_LIBDIR%%/test/data/README
 %%PYTHON_LIBDIR%%/test/datetimetester.py
@@ -3386,6 +3398,17 @@ man/man1/python3.3.1.gz
 %%PYTHON_LIBDIR%%/test/gdb_sample.py
 %%PYTHON_LIBDIR%%/test/https_svn_python_org_root.pem
 %%PYTHON_LIBDIR%%/test/ieee754.txt
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.bmp
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.gif
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.jpg
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.pbm
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.pgm
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.png
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.ppm
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.ras
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.sgi
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.tiff
+%%PYTHON_LIBDIR%%/test/imghdrdata/python.xbm
 %%PYTHON_LIBDIR%%/test/inspect_fodder.py
 %%PYTHON_LIBDIR%%/test/inspect_fodder2.py
 %%PYTHON_LIBDIR%%/test/keycert.passwd.pem
@@ -3748,6 +3771,7 @@ man/man1/python3.3.1.gz
 %%PYTHON_LIBDIR%%/test/test_httpservers.py
 %%PYTHON_LIBDIR%%/test/test_idle.py
 %%PYTHON_LIBDIR%%/test/test_imaplib.py
+%%PYTHON_LIBDIR%%/test/test_imghdr.py
 %%PYTHON_LIBDIR%%/test/test_imp.py
 %%PYTHON_LIBDIR%%/test/test_import.py
 %%PYTHON_LIBDIR%%/test/test_importhooks.py
@@ -4662,6 +4686,7 @@ man/man1/python3.3.1.gz
 @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
 @dirrm %%PYTHON_LIBDIR%%/test/encoded_modules/__pycache__
 @dirrm %%PYTHON_LIBDIR%%/test/encoded_modules
+@dirrm %%PYTHON_LIBDIR%%/test/imghdrdata
 @dirrm %%PYTHON_LIBDIR%%/test/namespace_pkgs/project3/parent/child/__pycache__
 @dirrm %%PYTHON_LIBDIR%%/test/namespace_pkgs/project3/parent/child
 @dirrm %%PYTHON_LIBDIR%%/test/namespace_pkgs/project3/parent