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
f45abc97
Commit
f45abc97
authored
Sep 06, 2010
by
Raymond Hettinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add method to OrderedDict for repositioning keys to the ends.
parent
7b2a7710
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
51 additions
and
8 deletions
+51
-8
Doc/library/collections.rst
Doc/library/collections.rst
+17
-0
Lib/collections.py
Lib/collections.py
+17
-6
Lib/functools.py
Lib/functools.py
+1
-1
Lib/test/test_collections.py
Lib/test/test_collections.py
+13
-1
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Doc/library/collections.rst
View file @
f45abc97
...
...
@@ -793,6 +793,23 @@ the items are returned in the order their keys were first added.
(key, value) pair. The pairs are returned in LIFO order if *last* is true
or FIFO order if false.
.. method:: move_to_end(key, last=True)
Move an existing *key* to either end of an ordered dictionary. The item
is moved to the right end if *last* is true (the default) or to the
beginning if *last* is false. Raises :exc:`KeyError` if the *key* does
not exist::
>>> d = OrderedDict.fromkeys('abcde')
>>> d.move_to_end('b')
>>> ''.join(d.keys)
'acdeb'
>>> d.move_to_end('b', 0)
>>> ''.join(d.keys)
'bacde'
.. versionadded:: 3.2
In addition to the usual mapping methods, ordered dictionaries also support
reverse iteration using :func:`reversed`.
...
...
Lib/collections.py
View file @
f45abc97
...
...
@@ -173,18 +173,29 @@ class OrderedDict(dict, MutableMapping):
def
__del__
(
self
):
self
.
clear
()
# eliminate cyclical references
def
_renew
(
self
,
key
,
PREV
=
0
,
NEXT
=
1
):
'Fast version of self[key]=self.pop(key). Private method for internal use.'
def
move_to_end
(
self
,
key
,
last
=
True
,
PREV
=
0
,
NEXT
=
1
):
'''Move an existing element to the end (or beginning if last==False).
Raises KeyError if the element does not exist.
When last=True, acts like a fast version of self[key]=self.pop(key).
'''
link
=
self
.
__map
[
key
]
link_prev
=
link
[
PREV
]
link_next
=
link
[
NEXT
]
link_prev
[
NEXT
]
=
link_next
link_next
[
PREV
]
=
link_prev
root
=
self
.
__root
last
=
root
[
PREV
]
link
[
PREV
]
=
last
link
[
NEXT
]
=
root
last
[
NEXT
]
=
root
[
PREV
]
=
link
if
last
:
last
=
root
[
PREV
]
link
[
PREV
]
=
last
link
[
NEXT
]
=
root
last
[
NEXT
]
=
root
[
PREV
]
=
link
else
:
first
=
root
[
NEXT
]
link
[
PREV
]
=
root
link
[
NEXT
]
=
first
root
[
NEXT
]
=
first
[
PREV
]
=
link
################################################################################
...
...
Lib/functools.py
View file @
f45abc97
...
...
@@ -127,7 +127,7 @@ def lru_cache(maxsize=100):
len
=
len
,
KeyError
=
KeyError
):
cache
=
OrderedDict
()
# ordered least recent to most recent
cache_popitem
=
cache
.
popitem
cache_renew
=
cache
.
_renew
cache_renew
=
cache
.
move_to_end
kwd_mark
=
object
()
# separate positional and keyword args
lock
=
Lock
()
...
...
Lib/test/test_collections.py
View file @
f45abc97
...
...
@@ -973,7 +973,19 @@ class TestOrderedDict(unittest.TestCase):
od
[
'a'
]
=
1
self
.
assertEqual
(
list
(
od
.
items
()),
[(
'b'
,
2
),
(
'a'
,
1
)])
def
test_move_to_end
(
self
):
od
=
OrderedDict
.
fromkeys
(
'abcde'
)
self
.
assertEqual
(
list
(
od
),
list
(
'abcde'
))
od
.
move_to_end
(
'c'
)
self
.
assertEqual
(
list
(
od
),
list
(
'abdec'
))
od
.
move_to_end
(
'c'
,
0
)
self
.
assertEqual
(
list
(
od
),
list
(
'cabde'
))
od
.
move_to_end
(
'c'
,
0
)
self
.
assertEqual
(
list
(
od
),
list
(
'cabde'
))
od
.
move_to_end
(
'e'
)
self
.
assertEqual
(
list
(
od
),
list
(
'cabde'
))
with
self
.
assertRaises
(
KeyError
):
od
.
move_to_end
(
'x'
)
class
GeneralMappingTests
(
mapping_tests
.
BasicTestMappingProtocol
):
type2test
=
OrderedDict
...
...
Misc/NEWS
View file @
f45abc97
...
...
@@ -13,6 +13,9 @@ Core and Builtins
Library
-------
- collections.OrderedDict now supports a new method for repositioning
keys to either end.
- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest
test cases now also have assertWarns and assertWarnsRegexp methods to
check that a given warning type was triggered by the code under test.
...
...
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