Mailman 3 July 2009 - Python-checkins

r74247 - in python/branches/py3k: Doc/library/urllib.parse.rst
by georg.brandl 29 Jul '09

29 Jul '09

Author: georg.brandl Date: Wed Jul 29 09:27:08 2009 New Revision: 74247 Log: Merged revisions 74239 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74239 | georg.brandl | 2009-07-28 18:55:32 +0000 (Di, 28 Jul 2009) | 1 line Clarify quote_plus() usage. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/library/urllib.parse.rst Modified: python/branches/py3k/Doc/library/urllib.parse.rst ============================================================================== --- python/branches/py3k/Doc/library/urllib.parse.rst (original) +++ python/branches/py3k/Doc/library/urllib.parse.rst Wed Jul 29 09:27:08 2009 @@ -249,9 +249,9 @@ .. function:: quote_plus(string[, safe[, encoding[, errors]]]) Like :func:`quote`, but also replace spaces by plus signs, as required for - quoting HTML form values. Plus signs in the original string are escaped - unless they are included in *safe*. It also does not have *safe* default to - ``'/'``. + quoting HTML form values when building up a query string to go into a URL. + Plus signs in the original string are escaped unless they are included in + *safe*. It also does not have *safe* default to ``'/'``. Example: ``quote_plus('/El Niño/')`` yields ``'%2FEl+Ni%C3%B1o%2F'``.

1 0

Python Regression Test Failures refleak (3)
by Neal Norwitz 28 Jul '09

28 Jul '09

More important issues: ---------------------- test_io leaked [237, 237, 237] references, sum=711 test_memoryio leaked [267, 267, 267] references, sum=801 test_ssl leaked [-81, 420, 0] references, sum=339 Less important issues: ---------------------- test_smtplib leaked [0, -88, 88] references, sum=0 test_sys leaked [0, 42, 0] references, sum=42 test_threading leaked [48, 48, 48] references, sum=144 test_urllib2_localnet leaked [277, -277, 0] references, sum=0

1 0

r74246 - in python/branches/py3k: Lib/test/test_zipfile.py Lib/zipfile.py Misc/NEWS
by amaury.forgeotdarc 28 Jul '09

28 Jul '09

Author: amaury.forgeotdarc Date: Wed Jul 29 00:18:57 2009 New Revision: 74246 Log: Merged revisions 74245 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74245 | amaury.forgeotdarc | 2009-07-29 00:15:30 +0200 (mer., 29 juil. 2009) | 3 lines #6511: ZipFile will now raise BadZipfile when opening an empty or tiny file, like it does for larger invalid files. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_zipfile.py python/branches/py3k/Lib/zipfile.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/test/test_zipfile.py ============================================================================== --- python/branches/py3k/Lib/test/test_zipfile.py (original) +++ python/branches/py3k/Lib/test/test_zipfile.py Wed Jul 29 00:18:57 2009 @@ -701,6 +701,16 @@ # quickly. self.assertRaises(IOError, zipfile.ZipFile, TESTFN) + def test_empty_file_raises_BadZipFile(self): + f = open(TESTFN, 'w') + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + + f = open(TESTFN, 'w') + f.write("short file") + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + def test_closed_zip_raises_RuntimeError(self): # Verify that testzip() doesn't swallow inappropriate exceptions. data = io.BytesIO() Modified: python/branches/py3k/Lib/zipfile.py ============================================================================== --- python/branches/py3k/Lib/zipfile.py (original) +++ python/branches/py3k/Lib/zipfile.py Wed Jul 29 00:18:57 2009 @@ -200,7 +200,10 @@ # Check to see if this is ZIP file with no archive comment (the # "end of central directory" structure should be the last item in the # file if this is the case). - fpin.seek(-sizeEndCentDir, 2) + try: + fpin.seek(-sizeEndCentDir, 2) + except IOError: + return None data = fpin.read() if data[0:4] == stringEndArchive and data[-2:] == b"\000\000": # the signature is correct and there's no comment, unpack structure Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Wed Jul 29 00:18:57 2009 @@ -956,7 +956,10 @@ Library ------- -- Issue #6545: Removed assert statements in distutils.Extension, so the +- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when + opening an empty or very small file. + +- Issue #6545: Removed assert statements in distutils.Extension, so the behavior is similar when used with -O. - unittest has been split up into a package. All old names should still work.

1 0

r74245 - in python/trunk: Lib/test/test_zipfile.py Lib/zipfile.py Misc/NEWS
by amaury.forgeotdarc 28 Jul '09

28 Jul '09

Author: amaury.forgeotdarc Date: Wed Jul 29 00:15:30 2009 New Revision: 74245 Log: #6511: ZipFile will now raise BadZipfile when opening an empty or tiny file, like it does for larger invalid files. Modified: python/trunk/Lib/test/test_zipfile.py python/trunk/Lib/zipfile.py python/trunk/Misc/NEWS Modified: python/trunk/Lib/test/test_zipfile.py ============================================================================== --- python/trunk/Lib/test/test_zipfile.py (original) +++ python/trunk/Lib/test/test_zipfile.py Wed Jul 29 00:15:30 2009 @@ -703,6 +703,16 @@ # quickly. self.assertRaises(IOError, zipfile.ZipFile, TESTFN) + def test_empty_file_raises_BadZipFile(self): + f = open(TESTFN, 'w') + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + + f = open(TESTFN, 'w') + f.write("short file") + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + def test_closed_zip_raises_RuntimeError(self): # Verify that testzip() doesn't swallow inappropriate exceptions. data = StringIO() Modified: python/trunk/Lib/zipfile.py ============================================================================== --- python/trunk/Lib/zipfile.py (original) +++ python/trunk/Lib/zipfile.py Wed Jul 29 00:15:30 2009 @@ -198,7 +198,10 @@ # Check to see if this is ZIP file with no archive comment (the # "end of central directory" structure should be the last item in the # file if this is the case). - fpin.seek(-sizeEndCentDir, 2) + try: + fpin.seek(-sizeEndCentDir, 2) + except IOError: + return None data = fpin.read() if data[0:4] == stringEndArchive and data[-2:] == "\000\000": # the signature is correct and there's no comment, unpack structure Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed Jul 29 00:15:30 2009 @@ -354,6 +354,9 @@ Library ------- +- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when + opening an empty or very small file. + - Issue #6553: Fixed a crash in cPickle.load(), when given a file-like object containing incomplete data.

1 0

r74244 - python/branches/py3k
by amaury.forgeotdarc 28 Jul '09

28 Jul '09

Author: amaury.forgeotdarc Date: Tue Jul 28 23:32:43 2009 New Revision: 74244 Log: Blocked revisions 74243 via svnmerge ........ r74243 | amaury.forgeotdarc | 2009-07-28 22:47:55 +0200 (mar., 28 juil. 2009) | 2 lines "Fix" for the refleak report: the ABC classes are now in the _pyio module ........ Modified: python/branches/py3k/ (props changed)

1 0

r74243 - python/trunk/Lib/test/regrtest.py
by amaury.forgeotdarc 28 Jul '09

28 Jul '09

Author: amaury.forgeotdarc Date: Tue Jul 28 22:47:55 2009 New Revision: 74243 Log: "Fix" for the refleak report: the ABC classes are now in the _pyio module Modified: python/trunk/Lib/test/regrtest.py Modified: python/trunk/Lib/test/regrtest.py ============================================================================== --- python/trunk/Lib/test/regrtest.py (original) +++ python/trunk/Lib/test/regrtest.py Tue Jul 28 22:47:55 2009 @@ -746,7 +746,7 @@ False if the test didn't leak references; True if we detected refleaks. """ # This code is hackish and inelegant, but it seems to do the job. - import copy_reg, _abcoll, io + import copy_reg, _abcoll, _pyio if not hasattr(sys, 'gettotalrefcount'): raise Exception("Tracking reference leaks requires a debug build " @@ -757,7 +757,7 @@ ps = copy_reg.dispatch_table.copy() pic = sys.path_importer_cache.copy() abcs = {} - modules = _abcoll, io + modules = _abcoll, _pyio for abc in [getattr(mod, a) for mod in modules for a in mod.__all__]: # XXX isinstance(abc, ABCMeta) leads to infinite recursion if not hasattr(abc, '_abc_registry'):

1 0

r74242 - python/branches/py3k
by mark.dickinson 28 Jul '09

28 Jul '09

Author: mark.dickinson Date: Tue Jul 28 22:36:23 2009 New Revision: 74242 Log: Blocked revisions 74240 via svnmerge ........ r74240 | mark.dickinson | 2009-07-28 21:35:03 +0100 (Tue, 28 Jul 2009) | 4 lines Issue #6561: '\d' regular expression should not match characters of category [No]; only those of category [Nd]. (Backport of r74237 from py3k.) ........ Modified: python/branches/py3k/ (props changed)

1 0

r74241 - python/branches/release26-maint
by mark.dickinson 28 Jul '09

28 Jul '09

Author: mark.dickinson Date: Tue Jul 28 22:35:55 2009 New Revision: 74241 Log: Blocked revisions 74240 via svnmerge ........ r74240 | mark.dickinson | 2009-07-28 21:35:03 +0100 (Tue, 28 Jul 2009) | 4 lines Issue #6561: '\d' regular expression should not match characters of category [No]; only those of category [Nd]. (Backport of r74237 from py3k.) ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r74240 - in python/trunk: Doc/library/re.rst Lib/test/test_re.py Misc/NEWS Modules/_sre.c
by mark.dickinson 28 Jul '09

28 Jul '09

Author: mark.dickinson Date: Tue Jul 28 22:35:03 2009 New Revision: 74240 Log: Issue #6561: '\d' regular expression should not match characters of category [No]; only those of category [Nd]. (Backport of r74237 from py3k.) Modified: python/trunk/Doc/library/re.rst python/trunk/Lib/test/test_re.py python/trunk/Misc/NEWS python/trunk/Modules/_sre.c Modified: python/trunk/Doc/library/re.rst ============================================================================== --- python/trunk/Doc/library/re.rst (original) +++ python/trunk/Doc/library/re.rst Tue Jul 28 22:35:03 2009 @@ -332,7 +332,8 @@ ``\d`` When the :const:`UNICODE` flag is not specified, matches any decimal digit; this is equivalent to the set ``[0-9]``. With :const:`UNICODE`, it will match - whatever is classified as a digit in the Unicode character properties database. + whatever is classified as a decimal digit in the Unicode character properties + database. ``\D`` When the :const:`UNICODE` flag is not specified, matches any non-digit Modified: python/trunk/Lib/test/test_re.py ============================================================================== --- python/trunk/Lib/test/test_re.py (original) +++ python/trunk/Lib/test/test_re.py Tue Jul 28 22:35:03 2009 @@ -636,6 +636,27 @@ self.assertEqual(iter.next().span(), (4, 4)) self.assertRaises(StopIteration, iter.next) + def test_bug_6561(self): + # '\d' should match characters in Unicode category 'Nd' + # (Number, Decimal Digit), but not those in 'Nl' (Number, + # Letter) or 'No' (Number, Other). + decimal_digits = [ + u'\u0037', # '\N{DIGIT SEVEN}', category 'Nd' + u'\u0e58', # '\N{THAI DIGIT SIX}', category 'Nd' + u'\uff10', # '\N{FULLWIDTH DIGIT ZERO}', category 'Nd' + ] + for x in decimal_digits: + self.assertEqual(re.match('^\d$', x, re.UNICODE).group(0), x) + + not_decimal_digits = [ + u'\u2165', # '\N{ROMAN NUMERAL SIX}', category 'Nl' + u'\u3039', # '\N{HANGZHOU NUMERAL TWENTY}', category 'Nl' + u'\u2082', # '\N{SUBSCRIPT TWO}', category 'No' + u'\u32b4', # '\N{CIRCLED NUMBER THIRTY NINE}', category 'No' + ] + for x in not_decimal_digits: + self.assertIsNone(re.match('^\d$', x, re.UNICODE)) + def test_empty_array(self): # SF buf 1647541 import array Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Tue Jul 28 22:35:03 2009 @@ -1205,6 +1205,10 @@ Extension Modules ----------------- +- Issue #6561: '\d' in a regex now matches only characters with + Unicode category 'Nd' (Number, Decimal Digit). Previously it also + matched characters with category 'No'. + - Issue #1523: Remove deprecated overflow wrapping for struct.pack with an integer format code ('bBhHiIlLqQ'). Packing an out-of-range integer now consistently raises struct.error. Modified: python/trunk/Modules/_sre.c ============================================================================== --- python/trunk/Modules/_sre.c (original) +++ python/trunk/Modules/_sre.c Tue Jul 28 22:35:03 2009 @@ -172,7 +172,7 @@ #if defined(HAVE_UNICODE) -#define SRE_UNI_IS_DIGIT(ch) Py_UNICODE_ISDIGIT((Py_UNICODE)(ch)) +#define SRE_UNI_IS_DIGIT(ch) Py_UNICODE_ISDECIMAL((Py_UNICODE)(ch)) #define SRE_UNI_IS_SPACE(ch) Py_UNICODE_ISSPACE((Py_UNICODE)(ch)) #define SRE_UNI_IS_LINEBREAK(ch) Py_UNICODE_ISLINEBREAK((Py_UNICODE)(ch)) #define SRE_UNI_IS_ALNUM(ch) Py_UNICODE_ISALNUM((Py_UNICODE)(ch))

1 0

r74239 - python/trunk/Doc/library/urllib.rst
by georg.brandl 28 Jul '09

28 Jul '09

Author: georg.brandl Date: Tue Jul 28 20:55:32 2009 New Revision: 74239 Log: Clarify quote_plus() usage. Modified: python/trunk/Doc/library/urllib.rst Modified: python/trunk/Doc/library/urllib.rst ============================================================================== --- python/trunk/Doc/library/urllib.rst (original) +++ python/trunk/Doc/library/urllib.rst Tue Jul 28 20:55:32 2009 @@ -213,8 +213,9 @@ .. function:: quote_plus(string[, safe]) Like :func:`quote`, but also replaces spaces by plus signs, as required for - quoting HTML form values. Plus signs in the original string are escaped unless - they are included in *safe*. It also does not have *safe* default to ``'/'``. + quoting HTML form values when building up a query string to go into a URL. + Plus signs in the original string are escaped unless they are included in + *safe*. It also does not have *safe* default to ``'/'``. .. function:: unquote(string)

1 0