Mailman 3 September 2011 - Python-checkins

cpython: this isn't fixed on windows yet...
by benjamin.peterson Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/347c950fb663 changeset: 72486:347c950fb663 parent: 72484:3548149a806c user: Benjamin Peterson <benjamin(a)python.org> date: Wed Sep 28 10:48:32 2011 -0400 summary: this isn't fixed on windows yet... files: Lib/test/test_pep3131.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_pep3131.py b/Lib/test/test_pep3131.py --- a/Lib/test/test_pep3131.py +++ b/Lib/test/test_pep3131.py @@ -17,7 +17,10 @@ def test_non_bmp_normalized(self): 𝔘𝔫𝔦𝔠𝔬𝔡𝔢 = 1 - self.assertIn("Unicode", dir()) + try: + self.assertIn("Unicode", dir()) + except AssertionError: + raise unittest._ExpectedFailure("doesn't work yet") def test_invalid(self): try: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: #13012: use splitlines(keepends=True/False) instead of splitlines(0/1).
by ezio.melotti Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/83f43b58c988 changeset: 72485:83f43b58c988 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Wed Sep 28 17:37:55 2011 +0300 summary: #13012: use splitlines(keepends=True/False) instead of splitlines(0/1). files: Lib/argparse.py | 2 +- Lib/codecs.py | 14 +++++++------- Lib/collections/__init__.py | 2 +- Lib/difflib.py | 20 ++++++++++---------- Lib/doctest.py | 6 +++--- Lib/lib2to3/refactor.py | 4 ++-- Lib/string.py | 2 +- Lib/test/test_calendar.py | 2 +- Lib/test/test_email/__init__.py | 2 +- Lib/test/test_gzip.py | 4 ++-- Lib/test/test_inspect.py | 2 +- Lib/test/test_io.py | 4 ++-- Lib/test/test_nntplib.py | 4 ++-- Lib/test/test_pydoc.py | 4 ++-- Lib/test/test_tokenize.py | 2 +- Lib/unittest/case.py | 4 ++-- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Lib/argparse.py b/Lib/argparse.py --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -641,7 +641,7 @@ """ def _fill_text(self, text, width, indent): - return ''.join([indent + line for line in text.splitlines(True)]) + return ''.join(indent + line for line in text.splitlines(keepends=True)) class RawTextHelpFormatter(RawDescriptionHelpFormatter): diff --git a/Lib/codecs.py b/Lib/codecs.py --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -484,7 +484,7 @@ if firstline: newchars, decodedbytes = \ self.decode(data[:exc.start], self.errors) - lines = newchars.splitlines(True) + lines = newchars.splitlines(keepends=True) if len(lines)<=1: raise else: @@ -526,7 +526,7 @@ self.charbuffer = self.linebuffer[0] self.linebuffer = None if not keepends: - line = line.splitlines(False)[0] + line = line.splitlines(keepends=False)[0] return line readsize = size or 72 @@ -543,7 +543,7 @@ data += self.read(size=1, chars=1) line += data - lines = line.splitlines(True) + lines = line.splitlines(keepends=True) if lines: if len(lines) > 1: # More than one line result; the first line is a full line @@ -559,10 +559,10 @@ # only one remaining line, put it back into charbuffer self.charbuffer = lines[0] + self.charbuffer if not keepends: - line = line.splitlines(False)[0] + line = line.splitlines(keepends=False)[0] break line0withend = lines[0] - line0withoutend = lines[0].splitlines(False)[0] + line0withoutend = lines[0].splitlines(keepends=False)[0] if line0withend != line0withoutend: # We really have a line end # Put the rest back together and keep it until the next call self.charbuffer = self._empty_charbuffer.join(lines[1:]) + \ @@ -575,7 +575,7 @@ # we didn't get anything or this was our only try if not data or size is not None: if line and not keepends: - line = line.splitlines(False)[0] + line = line.splitlines(keepends=False)[0] break if readsize < 8000: readsize *= 2 @@ -803,7 +803,7 @@ data = self.reader.read() data, bytesencoded = self.encode(data, self.errors) - return data.splitlines(1) + return data.splitlines(keepends=True) def __next__(self): diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -1045,7 +1045,7 @@ return self.data.split(sep, maxsplit) def rsplit(self, sep=None, maxsplit=-1): return self.data.rsplit(sep, maxsplit) - def splitlines(self, keepends=0): return self.data.splitlines(keepends) + def splitlines(self, keepends=False): return self.data.splitlines(keepends) def startswith(self, prefix, start=0, end=_sys.maxsize): return self.data.startswith(prefix, start, end) def strip(self, chars=None): return self.__class__(self.data.strip(chars)) diff --git a/Lib/difflib.py b/Lib/difflib.py --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -800,7 +800,7 @@ ... 2. Explicit is better than implicit. ... 3. Simple is better than complex. ... 4. Complex is better than complicated. - ... '''.splitlines(1) + ... '''.splitlines(keepends=True) >>> len(text1) 4 >>> text1[0][-1] @@ -809,7 +809,7 @@ ... 3. Simple is better than complex. ... 4. Complicated is better than complex. ... 5. Flat is better than nested. - ... '''.splitlines(1) + ... '''.splitlines(keepends=True) Next we instantiate a Differ object: @@ -896,8 +896,8 @@ Example: - >>> print(''.join(Differ().compare('one\ntwo\nthree\n'.splitlines(1), - ... 'ore\ntree\nemu\n'.splitlines(1))), + >>> print(''.join(Differ().compare('one\ntwo\nthree\n'.splitlines(True), + ... 'ore\ntree\nemu\n'.splitlines(True))), ... end="") - one ? ^ @@ -1269,8 +1269,8 @@ Example: - >>> print(''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(1), - ... 'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current')), + >>> print(''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(True), + ... 'zero\none\ntree\nfour\n'.splitlines(True), 'Original', 'Current')), ... end="") *** Original --- Current @@ -1339,8 +1339,8 @@ Example: - >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1), - ... 'ore\ntree\nemu\n'.splitlines(1)) + >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(keepends=True), + ... 'ore\ntree\nemu\n'.splitlines(keepends=True)) >>> print(''.join(diff), end="") - one ? ^ @@ -2034,8 +2034,8 @@ Examples: - >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1), - ... 'ore\ntree\nemu\n'.splitlines(1)) + >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(keepends=True), + ... 'ore\ntree\nemu\n'.splitlines(keepends=True)) >>> diff = list(diff) >>> print(''.join(restore(diff, 1)), end="") one diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1332,7 +1332,7 @@ m = self.__LINECACHE_FILENAME_RE.match(filename) if m and m.group('name') == self.test.name: example = self.test.examples[int(m.group('examplenum'))] - return example.source.splitlines(True) + return example.source.splitlines(keepends=True) else: return self.save_linecache_getlines(filename, module_globals) @@ -1595,8 +1595,8 @@ # Check if we should use diff. if self._do_a_fancy_diff(want, got, optionflags): # Split want & got into lines. - want_lines = want.splitlines(True) # True == keep line ends - got_lines = got.splitlines(True) + want_lines = want.splitlines(keepends=True) + got_lines = got.splitlines(keepends=True) # Use difflib to find their differences. if optionflags & REPORT_UDIFF: diff = difflib.unified_diff(want_lines, got_lines, n=2) diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -560,7 +560,7 @@ block_lineno = None indent = None lineno = 0 - for line in input.splitlines(True): + for line in input.splitlines(keepends=True): lineno += 1 if line.lstrip().startswith(self.PS1): if block is not None: @@ -604,7 +604,7 @@ filename, lineno, err.__class__.__name__, err) return block if self.refactor_tree(tree, filename): - new = str(tree).splitlines(True) + new = str(tree).splitlines(keepends=True) # Undo the adjustment of the line numbers in wrap_toks() below. clipped, new = new[:lineno-1], new[lineno-1:] assert clipped == ["\n"] * (lineno-1), clipped diff --git a/Lib/string.py b/Lib/string.py --- a/Lib/string.py +++ b/Lib/string.py @@ -84,7 +84,7 @@ def _invalid(self, mo): i = mo.start('invalid') - lines = self.template[:i].splitlines(True) + lines = self.template[:i].splitlines(keepends=True) if not lines: colno = 1 lineno = 1 diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -177,7 +177,7 @@ return not c.isspace() and not c.isdigit() lines = [] - for line in s.splitlines(False): + for line in s.splitlines(keepends=False): # Drop texts, as they are locale dependent if line and not filter(neitherspacenordigit, line): lines.append(line) diff --git a/Lib/test/test_email/__init__.py b/Lib/test/test_email/__init__.py --- a/Lib/test/test_email/__init__.py +++ b/Lib/test/test_email/__init__.py @@ -38,7 +38,7 @@ return email.message_from_file(fp) def _bytes_repr(self, b): - return [repr(x) for x in b.splitlines(True)] + return [repr(x) for x in b.splitlines(keepends=True)] def assertBytesEqual(self, first, second, msg): """Our byte strings are really encoded strings; improve diff output""" diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -139,7 +139,7 @@ with io.BufferedReader(f) as r: lines = [line for line in r] - self.assertEqual(lines, 50 * data1.splitlines(True)) + self.assertEqual(lines, 50 * data1.splitlines(keepends=True)) def test_readline(self): self.test_write() @@ -340,7 +340,7 @@ def test_textio_readlines(self): # Issue #10791: TextIOWrapper.readlines() fails when wrapping GzipFile. - lines = (data1 * 50).decode("ascii").splitlines(True) + lines = (data1 * 50).decode("ascii").splitlines(keepends=True) self.test_write() with gzip.GzipFile(self.filename, 'r') as f: with io.TextIOWrapper(f, encoding="ascii") as t: diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -304,7 +304,7 @@ getlines = linecache.getlines def monkey(filename, module_globals=None): if filename == fn: - return source.splitlines(True) + return source.splitlines(keepends=True) else: return getlines(filename, module_globals) linecache.getlines = monkey diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -1935,8 +1935,8 @@ testdata = b"AAA\nBB\x00B\nCCC\rDDD\rEEE\r\nFFF\r\nGGG" normalized = testdata.replace(b"\r\n", b"\n").replace(b"\r", b"\n") for newline, expected in [ - (None, normalized.decode("ascii").splitlines(True)), - ("", testdata.decode("ascii").splitlines(True)), + (None, normalized.decode("ascii").splitlines(keepends=True)), + ("", testdata.decode("ascii").splitlines(keepends=True)), ("\n", ["AAA\n", "BB\x00B\n", "CCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]), ("\r\n", ["AAA\nBB\x00B\nCCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]), ("\r", ["AAA\nBB\x00B\nCCC\r", "DDD\r", "EEE\r", "\nFFF\r", "\nGGG"]), diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -1033,12 +1033,12 @@ self.assertEqual(resp, success_resp) # With an iterable of terminated lines def iterlines(b): - return iter(b.splitlines(True)) + return iter(b.splitlines(keepends=True)) resp = self._check_post_ihave_sub(func, *args, file_factory=iterlines) self.assertEqual(resp, success_resp) # With an iterable of non-terminated lines def iterlines(b): - return iter(b.splitlines(False)) + return iter(b.splitlines(keepends=False)) resp = self._check_post_ihave_sub(func, *args, file_factory=iterlines) self.assertEqual(resp, success_resp) diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -238,8 +238,8 @@ def print_diffs(text1, text2): "Prints unified diffs for two texts" # XXX now obsolete, use unittest built-in support - lines1 = text1.splitlines(True) - lines2 = text2.splitlines(True) + lines1 = text1.splitlines(keepends=True) + lines2 = text2.splitlines(keepends=True) diffs = difflib.unified_diff(lines1, lines2, n=0, fromfile='expected', tofile='got') print('\n' + ''.join(diffs)) diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -600,7 +600,7 @@ f.close() tokens1 = [tok[:2] for tok in token_list] new_bytes = untokenize(tokens1) - readline = (line for line in new_bytes.splitlines(1)).__next__ + readline = (line for line in new_bytes.splitlines(keepends=True)).__next__ tokens2 = [tok[:2] for tok in tokenize(readline)] return tokens1 == tokens2 diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -1010,8 +1010,8 @@ if (len(first) > self._diffThreshold or len(second) > self._diffThreshold): self._baseAssertEqual(first, second, msg) - firstlines = first.splitlines(True) - secondlines = second.splitlines(True) + firstlines = first.splitlines(keepends=True) + secondlines = second.splitlines(keepends=True) if len(firstlines) == 1 and first.strip('\r\n') == first: firstlines = [first + '\n'] secondlines = [second + '\n'] -- Repository URL: http://hg.python.org/cpython

1 0

cpython: this test works as expected now
by benjamin.peterson Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/3548149a806c changeset: 72484:3548149a806c user: Benjamin Peterson <benjamin(a)python.org> date: Wed Sep 28 08:20:00 2011 -0400 summary: this test works as expected now files: Lib/test/test_pep3131.py | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_pep3131.py b/Lib/test/test_pep3131.py --- a/Lib/test/test_pep3131.py +++ b/Lib/test/test_pep3131.py @@ -17,12 +17,7 @@ def test_non_bmp_normalized(self): 𝔘𝔫𝔦𝔠𝔬𝔡𝔢 = 1 - # On wide builds, this is normalized, but on narrow ones it is not. See - # #12746. - try: - self.assertIn("𝔘𝔫𝔦𝔠𝔬𝔡𝔢", dir()) - except AssertionError: - raise unittest.case._ExpectedFailure(sys.exc_info()) + self.assertIn("Unicode", dir()) def test_invalid(self): try: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: revert unintended change
by benjamin.peterson Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/d38a82804c1d changeset: 72483:d38a82804c1d user: Benjamin Peterson <benjamin(a)python.org> date: Wed Sep 28 08:19:25 2011 -0400 summary: revert unintended change files: Lib/test/test_pep3131.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_pep3131.py b/Lib/test/test_pep3131.py --- a/Lib/test/test_pep3131.py +++ b/Lib/test/test_pep3131.py @@ -19,7 +19,10 @@ 𝔘𝔫𝔦𝔠𝔬𝔡𝔢 = 1 # On wide builds, this is normalized, but on narrow ones it is not. See # #12746. - self.assertIn("Unicode", dir()) + try: + self.assertIn("𝔘𝔫𝔦𝔠𝔬𝔡𝔢", dir()) + except AssertionError: + raise unittest.case._ExpectedFailure(sys.exc_info()) def test_invalid(self): try: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: don't check that the first character is XID_Continue
by benjamin.peterson Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/37932fd9433a changeset: 72482:37932fd9433a user: Benjamin Peterson <benjamin(a)python.org> date: Wed Sep 28 08:09:05 2011 -0400 summary: don't check that the first character is XID_Continue Current, XID_Continue is a superset of XID_Start, but that may sometime change. files: Lib/test/test_pep3131.py | 5 +---- Objects/unicodeobject.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_pep3131.py b/Lib/test/test_pep3131.py --- a/Lib/test/test_pep3131.py +++ b/Lib/test/test_pep3131.py @@ -19,10 +19,7 @@ 𝔘𝔫𝔦𝔠𝔬𝔡𝔢 = 1 # On wide builds, this is normalized, but on narrow ones it is not. See # #12746. - try: - self.assertIn("𝔘𝔫𝔦𝔠𝔬𝔡𝔢", dir()) - except AssertionError: - raise unittest.case._ExpectedFailure(sys.exc_info()) + self.assertIn("Unicode", dir()) def test_invalid(self): try: diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10196,7 +10196,7 @@ if (!_PyUnicode_IsXidStart(first) && first != 0x5F /* LOW LINE */) return 0; - for (i = 0; i < PyUnicode_GET_LENGTH(self); i++) + for (i = 1; i < PyUnicode_GET_LENGTH(self); i++) if (!_PyUnicode_IsXidContinue(PyUnicode_READ(kind, data, i))) return 0; return 1; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: test_ctypes: Windows is no more a special case
by victor.stinner Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/7f851d36c6ca changeset: 72481:7f851d36c6ca user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Sep 28 13:36:20 2011 +0200 summary: test_ctypes: Windows is no more a special case files: Lib/ctypes/test/test_parameters.py | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py --- a/Lib/ctypes/test/test_parameters.py +++ b/Lib/ctypes/test/test_parameters.py @@ -73,13 +73,10 @@ except ImportError: ## print "(No c_wchar_p)" return - s = "123" - if sys.platform == "win32": - self.assertTrue(c_wchar_p.from_param(s)._obj is s) - self.assertRaises(TypeError, c_wchar_p.from_param, 42) - # new in 0.9.1: convert (decode) ascii to unicode - self.assertEqual(c_wchar_p.from_param("123")._obj, "123") + c_wchar_p.from_param("123") + + self.assertRaises(TypeError, c_wchar_p.from_param, 42) self.assertRaises(TypeError, c_wchar_p.from_param, b"123\377") pa = c_wchar_p.from_param(c_wchar_p("123")) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix struct sizes. Drop -1, since the resulting string was actually the largest
by martin.v.loewis Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/f19af08eef02 changeset: 72480:f19af08eef02 user: Martin v. Löwis <martin(a)v.loewis.de> date: Wed Sep 28 10:03:28 2011 +0200 summary: Fix struct sizes. Drop -1, since the resulting string was actually the largest one that could be allocated. files: Lib/test/test_unicode.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1585,12 +1585,12 @@ def test_raiseMemError(self): if struct.calcsize('P') == 8: # 64 bits pointers - ascii_struct_size = 64 - compact_struct_size = 88 + ascii_struct_size = 48 + compact_struct_size = 72 else: # 32 bits pointers - ascii_struct_size = 32 - compact_struct_size = 44 + ascii_struct_size = 24 + compact_struct_size = 36 for char in ('a', '\xe9', '\u20ac', '\U0010ffff'): code = ord(char) @@ -1604,8 +1604,9 @@ char_size = 4 # sizeof(Py_UCS4) struct_size = compact_struct_size # Note: sys.maxsize is half of the actual max allocation because of - # the signedness of Py_ssize_t. -1 because of the null character. - maxlen = ((sys.maxsize - struct_size) // char_size) - 1 + # the signedness of Py_ssize_t. Strings of maxlen-1 should in principle + # be allocatable, given enough memory. + maxlen = ((sys.maxsize - struct_size) // char_size) alloc = lambda: char * maxlen self.assertRaises(MemoryError, alloc) self.assertRaises(MemoryError, alloc) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Use compile() instead of eval().
by martin.v.loewis Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/636444a2827e changeset: 72479:636444a2827e user: Martin v. Löwis <martin(a)v.loewis.de> date: Wed Sep 28 09:22:13 2011 +0200 summary: Use compile() instead of eval(). files: Lib/test/test_sys.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -856,12 +856,10 @@ # verify that the UTF-8 size is accounted for s = chr(0x4000) # 4 bytes canonical representation check(s, size(compactfields) + 4) - try: - # eval() will trigger the generation of the UTF-8 representation - # as a side effect - eval(s) - except NameError: - check(s, size(compactfields) + 4 + 4) + # compile() will trigger the generation of the UTF-8 + # representation as a side effect + compile(s, "<stdin>", "eval") + check(s, size(compactfields) + 4 + 4) # TODO: add check that forces the presence of wchar_t representation # TODO: add check that forces layout of unicodefields # weakref -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Use eval instead of codecs.lookup to trigger UTF-8 generation.
by martin.v.loewis Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/6d2d45ab084d changeset: 72478:6d2d45ab084d user: Martin v. Löwis <martin(a)v.loewis.de> date: Wed Sep 28 09:15:11 2011 +0200 summary: Use eval instead of codecs.lookup to trigger UTF-8 generation. files: Lib/test/test_sys.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -857,12 +857,10 @@ s = chr(0x4000) # 4 bytes canonical representation check(s, size(compactfields) + 4) try: - # FIXME: codecs.lookup(str) calls encoding.search_function() which - # calls __import__ using str in the module name. __import__ encodes - # the module name to the file system encoding (which is the locale - # encoding), so test_sys fails if the locale encoding is not UTF-8. - codecs.lookup(s) # produces 4 bytes UTF-8 - except LookupError: + # eval() will trigger the generation of the UTF-8 representation + # as a side effect + eval(s) + except NameError: check(s, size(compactfields) + 4 + 4) # TODO: add check that forces the presence of wchar_t representation # TODO: add check that forces layout of unicodefields -- Repository URL: http://hg.python.org/cpython

1 0

cpython: ACKS for PEP 393.
by martin.v.loewis Sept. 28, 2011

Sept. 28, 2011

http://hg.python.org/cpython/rev/bbb0c4fdd90c changeset: 72477:bbb0c4fdd90c user: Martin v. Löwis <martin(a)v.loewis.de> date: Wed Sep 28 08:54:17 2011 +0200 summary: ACKS for PEP 393. files: Misc/NEWS | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,7 +10,8 @@ Core and Builtins ----------------- -- PEP 393: flexible string representation. +- PEP 393: flexible string representation. Thanks to Torsten Becker for the + initial implementation, and Victor Stinner for various bug fixes. - Issue #13012: The 'keepends' parameter to str.splitlines may now be passed as a keyword argument: "my_string.splitlines(keepends=True)". The same -- Repository URL: http://hg.python.org/cpython

1 0