mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 05:45:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Closes #14462: allow any valid Python identifier in sre group names, as documented.

Browse source
This commit is contained in:
Georg Brandl 2013-04-14 11:40:00 +02:00
parent 991fc5736e
commit 1d472b74cb
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/sre_parse.py
View file

@ -225,13 +225,25 @@ class Tokenizer:
def seek(self, index):
self.index, self.next = index
# The following three functions are not used in this module anymore, but we keep
# them here (with DeprecationWarnings) for backwards compatibility.
def isident(char):
import warnings
warnings.warn('sre_parse.isident() will be removed in 3.5',
DeprecationWarning, stacklevel=2)
return "a" <= char <= "z" or "A" <= char <= "Z" or char == "_"
def isdigit(char):
import warnings
warnings.warn('sre_parse.isdigit() will be removed in 3.5',
DeprecationWarning, stacklevel=2)
return "0" <= char <= "9"
def isname(name):
import warnings
warnings.warn('sre_parse.isname() will be removed in 3.5',
DeprecationWarning, stacklevel=2)
# check that group name is a valid string
if not isident(name[0]):
return False
@ -587,7 +599,7 @@ def _parse(source, state):
group = 1
if not name:
raise error("missing group name")
if not isname(name):
if not name.isidentifier():
raise error("bad character in group name")
elif sourcematch("="):
# named backreference
@ -601,7 +613,7 @@ def _parse(source, state):
name = name + char
if not name:
raise error("missing group name")
if not isname(name):
if not name.isidentifier():
raise error("bad character in group name")
gid = state.groupdict.get(name)
if gid is None:
@ -655,7 +667,7 @@ def _parse(source, state):
group = 2
if not condname:
raise error("missing group name")
if isname(condname):
if condname.isidentifier():
condgroup = state.groupdict.get(condname)
if condgroup is None:
raise error("unknown group name")
@ -792,7 +804,7 @@ def parse_template(source, pattern):
if index < 0:
raise error("negative group number")
except ValueError:
if not isname(name):
if not name.isidentifier():
raise error("bad character in group name")
try:
index = pattern.groupindex[name]