From 5049a81628147e5e2855a80eea1d170e25538460 Mon Sep 17 00:00:00 2001 From: Srinivas Reddy Thatiparthy Date: Tue, 26 Dec 2017 09:44:43 +0530 Subject: [PATCH 1/2] Remove OrderedDict from re module --- Lib/re.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Lib/re.py b/Lib/re.py index a8b6753d390964..522b1ee161c61a 100644 --- a/Lib/re.py +++ b/Lib/re.py @@ -128,12 +128,6 @@ except ImportError: _locale = None -# try _collections first to reduce startup cost -try: - from _collections import OrderedDict -except ImportError: - from collections import OrderedDict - # public symbols __all__ = [ @@ -271,7 +265,7 @@ def escape(pattern): # -------------------------------------------------------------------- # internals -_cache = OrderedDict() +_cache = {} _MAXCACHE = 512 def _compile(pattern, flags): @@ -293,7 +287,7 @@ def _compile(pattern, flags): if not (flags & DEBUG): if len(_cache) >= _MAXCACHE: try: - _cache.popitem(last=False) + _cache.pop(list(_cache.keys())[0]) except KeyError: pass _cache[type(pattern), pattern, flags] = p From a2792b5760ac94715ff4c3e03731108a80f42bc6 Mon Sep 17 00:00:00 2001 From: Srinivas Reddy Thatiparthy Date: Tue, 26 Dec 2017 10:09:01 +0530 Subject: [PATCH 2/2] Add News entry --- .../NEWS.d/next/Library/2017-12-26-10-06-23.bpo-32360.BseRtQ.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2017-12-26-10-06-23.bpo-32360.BseRtQ.rst diff --git a/Misc/NEWS.d/next/Library/2017-12-26-10-06-23.bpo-32360.BseRtQ.rst b/Misc/NEWS.d/next/Library/2017-12-26-10-06-23.bpo-32360.BseRtQ.rst new file mode 100644 index 00000000000000..79709dda4580e9 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-12-26-10-06-23.bpo-32360.BseRtQ.rst @@ -0,0 +1 @@ +Remove `OrderedDict` from `re` module.