From: Raymond Hettinger Date: Wed, 23 Mar 2011 21:38:39 +0000 (-0700) Subject: Minor clean-ups. X-Git-Tag: v3.3.0a1~2778 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15d0c1d0738b2146949c0f6769c3945d41dfa426;p=python Minor clean-ups. --- diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index 652e4f1e38..5f11f6a4f4 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -321,7 +321,9 @@ def namedtuple(typename, field_names, verbose=False, rename=False): for index, name in enumerate(field_names): if (not all(c.isalnum() or c=='_' for c in name) or _iskeyword(name) - or not name or name[0].isdigit() or name.startswith('_') + or not name + or name[0].isdigit() + or name.startswith('_') or name in seen): field_names[index] = '_%d' % index seen.add(name) @@ -351,8 +353,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False): for index, name in enumerate(field_names)) ) - # Execute the class definition string in a temporary namespace and - # support tracing utilities by setting a value for frame.f_globals['__name__'] + # Execute the class definition string in a temporary namespace namespace = {} try: exec(class_definition, namespace)