diff options
Diffstat (limited to 'Lib/collections.py')
| -rw-r--r-- | Lib/collections.py | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Lib/collections.py b/Lib/collections.py index 2a7bb62..d539683 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -1,17 +1,15 @@ __all__ = ['deque', 'defaultdict', 'namedtuple'] - -from _collections import deque, defaultdict -from operator import itemgetter as _itemgetter -from itertools import izip as _izip -from keyword import iskeyword as _iskeyword -import sys as _sys - # For bootstrapping reasons, the collection ABCs are defined in _abcoll.py. # They should however be considered an integral part of collections.py. from _abcoll import * import _abcoll __all__ += _abcoll.__all__ +from _collections import deque, defaultdict +from operator import itemgetter as _itemgetter +from keyword import iskeyword as _iskeyword +import sys as _sys + def namedtuple(typename, field_names, verbose=False): """Returns a new subclass of tuple with named fields. @@ -19,9 +17,9 @@ def namedtuple(typename, field_names, verbose=False): >>> Point.__doc__ # docstring for the new class 'Point(x, y)' >>> p = Point(11, y=22) # instantiate with positional args or keywords - >>> p[0] + p[1] # works just like the tuple (11, 22) + >>> p[0] + p[1] # indexable like a plain tuple 33 - >>> x, y = p # unpacks just like a tuple + >>> x, y = p # unpack like a regular tuple >>> x, y (11, 22) >>> p.x + p.y # fields also accessable by name @@ -58,31 +56,35 @@ def namedtuple(typename, field_names, verbose=False): # Create and fill-in the class template argtxt = repr(field_names).replace("'", "")[1:-1] # tuple repr without parens or quotes reprtxt = ', '.join('%s=%%r' % name for name in field_names) + dicttxt = ', '.join('%r: t[%d]' % (name, pos) for pos, name in enumerate(field_names)) template = '''class %(typename)s(tuple): '%(typename)s(%(argtxt)s)' \n __slots__ = () \n - _fields = property(lambda self: %(field_names)r) \n def __new__(cls, %(argtxt)s): return tuple.__new__(cls, (%(argtxt)s)) \n + _cast = classmethod(tuple.__new__) \n def __repr__(self): return '%(typename)s(%(reprtxt)s)' %% self \n - def _asdict(self, dict=dict, zip=zip): + def _asdict(t): 'Return a new dict which maps field names to their values' - return dict(zip(%(field_names)r, self)) \n + return {%(dicttxt)s} \n def _replace(self, **kwds): 'Return a new %(typename)s object replacing specified fields with new values' - return %(typename)s(*map(kwds.get, %(field_names)r, self)) \n\n''' % locals() + return %(typename)s._cast(map(kwds.get, %(field_names)r, self)) \n + @property + def _fields(self): + return %(field_names)r \n\n''' % locals() for i, name in enumerate(field_names): template += ' %s = property(itemgetter(%d))\n' % (name, i) if verbose: print(template) # Execute the template string in a temporary namespace - namespace = dict(itemgetter=_itemgetter, zip=_izip) + namespace = dict(itemgetter=_itemgetter) try: exec(template, namespace) except SyntaxError as e: - raise SyntaxError(e.message + ':\n' + template) + raise SyntaxError(e.msg + ':\n' + template) from e result = namespace[typename] # For pickling to work, the __module__ variable needs to be set to the frame |