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

Will backport
This commit is contained in:
Neal Norwitz 2007-06-11 07:29:43 +00:00
parent ade2c216e1
commit c161cb9955
3 changed files with 16 additions and 1 deletions

View File

@ -52,7 +52,7 @@ class Repr:
return '%s%s%s' % (left, s, right)
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):
return self._repr_iterable(x, level, '[', ']', self.maxlist)

View File

@ -10,6 +10,7 @@ import unittest
from test.test_support import run_unittest
from repr import repr as r # Don't shadow builtin repr
from repr import Repr
def nestedTuple(nesting):
@ -34,6 +35,18 @@ class ReprTests(unittest.TestCase):
expected = repr(s)[:13] + "..." + repr(s)[-14:]
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):
from array import array
from collections import deque

View File

@ -229,6 +229,8 @@ Core and builtins
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
that it actually works with HTTP, HTTPS, FTP and FTPS connections).