From fcc3e6dc03021b09f66e433dfc5ca2c6f9aace80 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Sun, 21 Nov 2010 10:44:11 +0100 Subject: [PATCH] Remove copy of namedtuple implementation. --- linkcheck/containers.py | 78 ++--------------------------------------- 1 file changed, 2 insertions(+), 76 deletions(-) diff --git a/linkcheck/containers.py b/linkcheck/containers.py index bcd06ca1..873d9110 100644 --- a/linkcheck/containers.py +++ b/linkcheck/containers.py @@ -18,6 +18,8 @@ Special container classes. """ +from collections import namedtuple + class AttrDict (dict): """Dictionary allowing attribute access to its elements if they are valid attribute names and not already existing methods.""" @@ -237,82 +239,6 @@ class LFUCache (dict): return value[1] -try: - from collections import namedtuple -except ImportError: - from keyword import iskeyword as _iskeyword - from operator import itemgetter as _itemgetter - import sys - - def namedtuple(typename, field_names, verbose=False): - # Parse and validate the field names. Validation serves two purposes, - # generating informative error messages and preventing template injection attacks. - if isinstance(field_names, basestring): - 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, new=tuple.__new__, len=len): - 'Make a new %(typename)s object from a sequence or iterable' - result = 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 in namespace - except SyntaxError, e: - raise SyntaxError(e.message + ':\n' + template) - 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 - - def enum (*names): """Return an enum datatype instance from given list of keyword names. The enum values are zero-based integers.