Kaydet (Commit) c161cb99 authored tarafından Neal Norwitz's avatar Neal Norwitz

Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.

Will backport
üst ade2c216
...@@ -52,7 +52,7 @@ class Repr: ...@@ -52,7 +52,7 @@ class Repr:
return '%s%s%s' % (left, s, right) return '%s%s%s' % (left, s, right)
def repr_tuple(self, x, level): def repr_tuple(self, x, level):
return self._repr_iterable(x, level, '(', ')', self.maxlist, ',') return self._repr_iterable(x, level, '(', ')', self.maxtuple, ',')
def repr_list(self, x, level): def repr_list(self, x, level):
return self._repr_iterable(x, level, '[', ']', self.maxlist) return self._repr_iterable(x, level, '[', ']', self.maxlist)
......
...@@ -10,6 +10,7 @@ import unittest ...@@ -10,6 +10,7 @@ import unittest
from test.test_support import run_unittest from test.test_support import run_unittest
from repr import repr as r # Don't shadow builtin repr from repr import repr as r # Don't shadow builtin repr
from repr import Repr
def nestedTuple(nesting): def nestedTuple(nesting):
...@@ -34,6 +35,18 @@ class ReprTests(unittest.TestCase): ...@@ -34,6 +35,18 @@ class ReprTests(unittest.TestCase):
expected = repr(s)[:13] + "..." + repr(s)[-14:] expected = repr(s)[:13] + "..." + repr(s)[-14:]
eq(r(s), expected) eq(r(s), expected)
def test_tuple(self):
eq = self.assertEquals
eq(r((1,)), "(1,)")
t3 = (1, 2, 3)
eq(r(t3), "(1, 2, 3)")
r2 = Repr()
r2.maxtuple = 2
expected = repr(t3)[:-2] + "...)"
eq(r2.repr(t3), expected)
def test_container(self): def test_container(self):
from array import array from array import array
from collections import deque from collections import deque
......
...@@ -229,6 +229,8 @@ Core and builtins ...@@ -229,6 +229,8 @@ Core and builtins
Library Library
------- -------
- Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
- The urlopen function of urllib2 now has an optional timeout parameter (note - The urlopen function of urllib2 now has an optional timeout parameter (note
that it actually works with HTTP, HTTPS, FTP and FTPS connections). that it actually works with HTTP, HTTPS, FTP and FTPS connections).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment