mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue 9840: Add reprlib.recursive_repr(), a decorator for handling recursive calls to __repr__ methods.

Browse source
This commit is contained in:
Raymond Hettinger 2010-09-13 21:36:00 +00:00
parent 9f0cbf1c72
commit 98a5f3f838
5 changed files with 91 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/collections.py
View file

@ -13,6 +13,7 @@ import sys as _sys
import heapq as _heapq
from weakref import proxy as _proxy
from itertools import repeat as _repeat, chain as _chain, starmap as _starmap
from reprlib import recursive_repr as _recursive_repr
################################################################################
### OrderedDict
@ -43,7 +44,6 @@ class OrderedDict(dict, MutableMapping):
'''
if len(args) > 1:
raise TypeError('expected at most 1 arguments, got %d' % len(args))
self.__in_repr = False # detects recursive repr
try:
self.__root
except AttributeError:
@ -97,10 +97,10 @@ class OrderedDict(dict, MutableMapping):
def __reduce__(self):
'Return state information for pickling'
items = [[k, self[k]] for k in self]
tmp = self.__map, self.__root, self.__in_repr
del self.__map, self.__root, self.__in_repr
tmp = self.__map, self.__root
del self.__map, self.__root
inst_dict = vars(self).copy()
self.__map, self.__root, self.__in_repr = tmp
self.__map, self.__root = tmp
if inst_dict:
return (self.__class__, (items,), inst_dict)
return self.__class__, (items,)
@ -167,18 +167,12 @@ class OrderedDict(dict, MutableMapping):
items = MutableMapping.items
__ne__ = MutableMapping.__ne__
@_recursive_repr()
def __repr__(self):
'od.__repr__() <==> repr(od)'
if not self:
return '%s()' % (self.__class__.__name__,)
if self.__in_repr:
return '...'
self.__in_repr = True
try:
result = '%s(%r)' % (self.__class__.__name__, list(self.items()))
finally:
self.__in_repr = False
return result
return '%s(%r)' % (self.__class__.__name__, list(self.items()))
def copy(self):
'od.copy() -> a shallow copy of od'