[Python-checkins] r55887 - in python/trunk: Lib/repr.py Lib/test/test_repr.py Misc/NEWS

Mon Jun 11 09:29:44 CEST 2007

Author: neal.norwitz
Date: Mon Jun 11 09:29:43 2007
New Revision: 55887
Modified:
 python/trunk/Lib/repr.py
 python/trunk/Lib/test/test_repr.py
 python/trunk/Misc/NEWS
Log:
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
Modified: python/trunk/Lib/repr.py
==============================================================================

--- python/trunk/Lib/repr.py	(original)
+++ python/trunk/Lib/repr.py	Mon Jun 11 09:29:43 2007
@@ -52,7 +52,7 @@
 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)
Modified: python/trunk/Lib/test/test_repr.py
==============================================================================
--- python/trunk/Lib/test/test_repr.py	(original)
+++ python/trunk/Lib/test/test_repr.py	Mon Jun 11 09:29:43 2007
@@ -10,6 +10,7 @@
 
 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 @@
 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
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Jun 11 09:29:43 2007
@@ -229,6 +229,8 @@
 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).
 
