Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
a4f52b12
Commit
a4f52b12
authored
Mar 02, 2009
by
Raymond Hettinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add OrderedDict support to collections.namedtuple().
parent
b62ad24c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
10 deletions
+16
-10
Doc/library/collections.rst
Doc/library/collections.rst
+9
-5
Lib/collections.py
Lib/collections.py
+5
-5
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Doc/library/collections.rst
View file @
a4f52b12
...
...
@@ -651,9 +651,9 @@ Example:
def __repr__(self):
return 'Point(x=%r, y=%r)' % self
<BLANKLINE>
def _asdict(
t
):
'Return a new
d
ict which maps field names to their values'
return
{'x': t[0], 'y': t[1]}
def _asdict(
self
):
'Return a new
OrderedD
ict which maps field names to their values'
return
OrderedDict(zip(self._fields, self))
<BLANKLINE>
def _replace(self, **kwds):
'Return a new Point object replacing specified fields with new values'
...
...
@@ -711,10 +711,14 @@ field names, the method and attribute names start with an underscore.
.. method:: somenamedtuple._asdict()
Return a new dict which maps field names to their corresponding values::
Return a new :class:`OrderedDict` which maps field names to their corresponding
values::
>>> p._asdict()
{'x': 11, 'y': 22}
OrderedDict([('x', 11), ('y', 22)])
.. versionchanged 3.1
Returns an :class:`OrderedDict` instead of a regular :class:`dict`.
.. method:: somenamedtuple._replace(kwargs)
...
...
Lib/collections.py
View file @
a4f52b12
...
...
@@ -149,7 +149,6 @@ def namedtuple(typename, field_names, verbose=False, rename=False):
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
...
...
@@ -165,9 +164,9 @@ def namedtuple(typename, field_names, verbose=False, rename=False):
return result
\
n
def __repr__(self):
return '%(typename)s(%(reprtxt)s)' %% self
\
n
def _asdict(
t
):
'Return a new
d
ict which maps field names to their values'
return
{%(dicttxt)s}
\
n
def _asdict(
self
):
'Return a new
OrderedD
ict which maps field names to their values'
return
OrderedDict(zip(self._fields, self))
\
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))
...
...
@@ -183,7 +182,8 @@ def namedtuple(typename, field_names, verbose=False, rename=False):
# Execute the template string in a temporary namespace and
# support tracing utilities by setting a value for frame.f_globals['__name__']
namespace
=
dict
(
itemgetter
=
_itemgetter
,
__name__
=
'namedtuple_%s'
%
typename
)
namespace
=
dict
(
itemgetter
=
_itemgetter
,
__name__
=
'namedtuple_%s'
%
typename
,
OrderedDict
=
OrderedDict
)
try
:
exec
(
template
,
namespace
)
except
SyntaxError
as
e
:
...
...
Misc/NEWS
View file @
a4f52b12
...
...
@@ -177,6 +177,8 @@ Library
- PEP 372: Added collections.OrderedDict().
- The _asdict() for method for namedtuples now returns an OrderedDict().
- Issue #1733986: Fixed mmap crash in accessing elements of second map object
with same tagname but larger size than first map. (Windows)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment