diff options
author | Raymond Hettinger <python@rcn.com> | 2016-09-12 07:18:31 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2016-09-12 07:18:31 (GMT) |
commit | 0d5048cb21e431c1a8221e15563837090946be81 (patch) | |
tree | c9e5960273276eb9377a54b8438dac48508161db /Lib/collections | |
parent | 11fa3ffcb11caf628435670b213f9bc2e3ba4f67 (diff) | |
download | cpython-0d5048cb21e431c1a8221e15563837090946be81.zip cpython-0d5048cb21e431c1a8221e15563837090946be81.tar.gz cpython-0d5048cb21e431c1a8221e15563837090946be81.tar.bz2 |
Issue #17941: Add a *module* parameter to collections.namedtuple()
Diffstat (limited to 'Lib/collections')
-rw-r--r-- | Lib/collections/__init__.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index 03ecea2..bcc4291 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -353,7 +353,7 @@ _field_template = '''\ {name} = _property(_itemgetter({index:d}), doc='Alias for field number {index:d}') ''' -def namedtuple(typename, field_names, *, verbose=False, rename=False): +def namedtuple(typename, field_names, *, verbose=False, rename=False, module=None): """Returns a new subclass of tuple with named fields. >>> Point = namedtuple('Point', ['x', 'y']) @@ -434,11 +434,15 @@ def namedtuple(typename, field_names, *, verbose=False, rename=False): # For pickling to work, the __module__ variable needs to be set to the frame # where the named tuple is created. Bypass this step in environments where # sys._getframe is not defined (Jython for example) or sys._getframe is not - # defined for arguments greater than 0 (IronPython). - try: - result.__module__ = _sys._getframe(1).f_globals.get('__name__', '__main__') - except (AttributeError, ValueError): - pass + # defined for arguments greater than 0 (IronPython), or where the user has + # specified a particular module. + if module is None: + try: + module = _sys._getframe(1).f_globals.get('__name__', '__main__') + except (AttributeError, ValueError): + pass + if module is not None: + result.__module__ = module return result |