Skip to content

bpo-32360: Remove OrderedDict from re module #5013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
srinivasreddy wants to merge 2 commits into from
+3 −8
Closed

bpo-32360: Remove OrderedDict from re module #5013

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5049a81
Remove OrderedDict from re module
srinivasreddy Dec 26, 2017
a2792b5
Add News entry
srinivasreddy Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove OrderedDict from re module
  • Loading branch information
@srinivasreddy
srinivasreddy committed Dec 26, 2017
commit 5049a81628147e5e2855a80eea1d170e25538460
10 changes: 2 additions & 8 deletions Lib/re.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = [
Expand Down Expand Up @@ -271,7 +265,7 @@ def escape(pattern):
# --------------------------------------------------------------------
# internals

_cache = OrderedDict()
_cache = {}

_MAXCACHE = 512
def _compile(pattern, flags):
Expand All @@ -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
Expand Down