mirror of
https://github.com/python/cpython.git
synced 2024-11-29 04:44:13 +08:00
faf2f63faf
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line Moved include "Python.h" in front of other imports to silence a warning. ........ r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines Minor fix-ups to named tuples: * Make the _replace() method respect subclassing. * Using property() to make _fields read-only wasn't a good idea. It caused len(Point._fields) to fail. * Add note to _cast() about length checking and alternative with the star-operator. ........ r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines Make math.{floor,ceil}({int,long}) return float again for backwards compatibility after r59671 made them return integral types. ........ r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint. ........ r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines Issue #1735: TarFile.extractall() now correctly sets directory permissions and times. (will backport to 2.5) ........ r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line Update links to bug/patch tracker ........ r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line Added interface to Windows' WSAIoctl and a simple example for a network sniffer. ........ r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro! ........ r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line Reverted last transaction. It's the wrong branch. ........ r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line socket.ioctl is only available on Windows ........ r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line Fix markup ........ r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line Fix markup ........ r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000 and adds errors for -0x. ........ r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py. ........ r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line Improve namedtuple's _cast() method with a docstring, new name, and error-checking. ........ r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line Add error-checking to namedtuple's _replace() method. ........ r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines clean up a comment ........ r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines Continue rolling back pep-3141 changes that changed behavior from 2.5. This round included: * Revert round to its 2.6 behavior (half away from 0). * Because round, floor, and ceil always return float again, it's no longer necessary to have them delegate to __xxx___, so I've ripped that out of their implementations and the Real ABC. This also helps in implementing types that work in both 2.6 and 3.0: you return int from the __xxx__ methods, and let it get enabled by the version upgrade. * Make pow(-1, .5) raise a ValueError again. ........ r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line Fix comment typo ........ r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line Add myself. ........ r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines Fix C++-style comment. ........ r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines Remove with_statement future imports from 2.6 docs. ........ r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines Simplify index entries; fix #1712. ........ r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst. ........ r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines Revert socket.rst to unix-eol. ........ r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines Set native svn:eol-style property for text files. ........ r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines #1719: capitalization error in "UuidCreate". ........ r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines Repair markup. ........ r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines Use markup. ........ r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line Final adjustments for #1601 ........ r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'. Fix by John Nagle. ........ r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines Add John Nagle (of issue #1637). ........ r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line Small code simplification. Forgot that classmethods can be called from intances. ........ r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines Use vcbuild for VS 2009. ........ r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines Package using VS 2008. ........ r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines Don't try to package msvcr90 for the moment. ........ r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines #1696393: don't check for '.' and '..' in ntpath.walk since they aren't returned from os.listdir anymore. Reported by Michael Haggerty. ........ r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines #1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir. Reported by Jesse Towner. ........ r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines #1591: Clarify docstring of Popen3. ........ r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines #1680: fix context manager example function name. ........ r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines #1755097: document default values for [].sort() and sorted(). ........
124 lines
4.9 KiB
Python
124 lines
4.9 KiB
Python
__all__ = ['deque', 'defaultdict', 'namedtuple']
|
|
# 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.
|
|
|
|
>>> Point = namedtuple('Point', 'x y')
|
|
>>> 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] # indexable like a plain tuple
|
|
33
|
|
>>> x, y = p # unpack like a regular tuple
|
|
>>> x, y
|
|
(11, 22)
|
|
>>> p.x + p.y # fields also accessable by name
|
|
33
|
|
>>> d = p._asdict() # convert to a dictionary
|
|
>>> d['x']
|
|
11
|
|
>>> Point(**d) # convert from a dictionary
|
|
Point(x=11, y=22)
|
|
>>> p._replace(x=100) # _replace() is like str.replace() but targets named fields
|
|
Point(x=100, y=22)
|
|
|
|
"""
|
|
|
|
# Parse and validate the field names
|
|
if isinstance(field_names, str):
|
|
field_names = field_names.replace(',', ' ').split() # names separated by whitespace and/or commas
|
|
field_names = tuple(field_names)
|
|
for name in (typename,) + field_names:
|
|
if not all(c.isalnum() or c=='_' for c in name):
|
|
raise ValueError('Type names and field names can only contain alphanumeric characters and underscores: %r' % name)
|
|
if _iskeyword(name):
|
|
raise ValueError('Type names and field names cannot be a keyword: %r' % name)
|
|
if name[0].isdigit():
|
|
raise ValueError('Type names and field names cannot start with a number: %r' % name)
|
|
seen_names = set()
|
|
for name in field_names:
|
|
if name.startswith('_'):
|
|
raise ValueError('Field names cannot start with an underscore: %r' % name)
|
|
if name in seen_names:
|
|
raise ValueError('Encountered duplicate field name: %r' % name)
|
|
seen_names.add(name)
|
|
|
|
# Create and fill-in the class template
|
|
numfields = len(field_names)
|
|
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 = %(field_names)r \n
|
|
def __new__(cls, %(argtxt)s):
|
|
return tuple.__new__(cls, (%(argtxt)s)) \n
|
|
@classmethod
|
|
def _make(cls, iterable):
|
|
'Make a new %(typename)s object from a sequence or iterable'
|
|
result = tuple.__new__(cls, iterable)
|
|
if len(result) != %(numfields)d:
|
|
raise TypeError('Expected %(numfields)d arguments, got %%d' %% len(result))
|
|
return result \n
|
|
def __repr__(self):
|
|
return '%(typename)s(%(reprtxt)s)' %% self \n
|
|
def _asdict(t):
|
|
'Return a new dict which maps field names to their values'
|
|
return {%(dicttxt)s} \n
|
|
def _replace(self, **kwds):
|
|
'Return a new %(typename)s object replacing specified fields with new values'
|
|
result = self._make(map(kwds.pop, %(field_names)r, self))
|
|
if kwds:
|
|
raise ValueError('Got unexpected field names: %%r' %% kwds.keys())
|
|
return result \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)
|
|
try:
|
|
exec(template, namespace)
|
|
except SyntaxError as e:
|
|
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
|
|
# where the named tuple is created. Bypass this step in enviroments where
|
|
# sys._getframe is not defined (Jython for example).
|
|
if hasattr(_sys, '_getframe'):
|
|
result.__module__ = _sys._getframe(1).f_globals['__name__']
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
# verify that instances can be pickled
|
|
from pickle import loads, dumps
|
|
Point = namedtuple('Point', 'x, y', True)
|
|
p = Point(x=10, y=20)
|
|
assert p == loads(dumps(p))
|
|
|
|
# test and demonstrate ability to override methods
|
|
Point.__repr__ = lambda self: 'Point(%.3f, %.3f)' % self
|
|
print(p)
|
|
|
|
import doctest
|
|
TestResults = namedtuple('TestResults', 'failed attempted')
|
|
print(TestResults(*doctest.testmod()))
|