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
b5d0a215
Commit
b5d0a215
authored
Nov 05, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #25554: Got rid of circular references in regular expression parsing.
parent
60a1d3cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
Lib/sre_parse.py
Lib/sre_parse.py
+6
-6
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/sre_parse.py
View file @
b5d0a215
...
...
@@ -70,14 +70,14 @@ class Pattern:
def __init__(self):
self.flags = 0
self.groupdict = {}
self.
subpattern
s = [None] # group 0
self.
groupwidth
s = [None] # group 0
self.lookbehindgroups = None
@property
def groups(self):
return len(self.
subpattern
s)
return len(self.
groupwidth
s)
def opengroup(self, name=None):
gid = self.groups
self.
subpattern
s.append(None)
self.
groupwidth
s.append(None)
if self.groups > MAXGROUPS:
raise error("
too
many
groups
")
if name is not None:
...
...
@@ -88,9 +88,9 @@ class Pattern:
self.groupdict[name] = gid
return gid
def closegroup(self, gid, p):
self.
subpatterns[gid] = p
self.
groupwidths[gid] = p.getwidth()
def checkgroup(self, gid):
return gid < self.groups and self.
subpattern
s[gid] is not None
return gid < self.groups and self.
groupwidth
s[gid] is not None
def checklookbehindgroup(self, gid, source):
if self.lookbehindgroups is not None:
...
...
@@ -195,7 +195,7 @@ class SubPattern:
lo = lo + 1
hi = hi + 1
elif op is GROUPREF:
i, j = self.pattern.
subpatterns[av].getwidth()
i, j = self.pattern.
groupwidths[av]
lo = lo + i
hi = hi + j
elif op is GROUPREF_EXISTS:
...
...
Misc/NEWS
View file @
b5d0a215
...
...
@@ -54,6 +54,8 @@ Core and Builtins
Library
-------
-
Issue
#
25554
:
Got
rid
of
circular
references
in
regular
expression
parsing
.
-
Issue
#
25510
:
fileinput
.
FileInput
.
readline
()
now
returns
b
''
instead
of
''
at
the
end
if
the
FileInput
was
opened
with
binary
mode
.
Patch
by
Ryosuke
Ito
.
...
...
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