Skip to content

bpo-38208: Simplify string.Template by using __init_subclass__(). #16256

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

Merged
serhiy-storchaka merged 3 commits into from
Oct 21, 2019
Merged

bpo-38208: Simplify string.Template by using __init_subclass__(). #16256

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce02c9b
bpo-38208: Simplify string.Template by using __init_subclass__().
serhiy-storchaka Sep 18, 2019
606a4da
Remove unrelated changes.
serhiy-storchaka Sep 18, 2019
68d895b
Address review comments.
serhiy-storchaka Sep 18, 2019
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
Prev Previous commit
Address review comments.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Sep 18, 2019
commit 68d895b36e908ef670fbf18580cba5e381a4e097
25 changes: 13 additions & 12 deletions Lib/string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,17 @@ def __init_subclass__(cls):
if 'pattern' in cls.__dict__:
pattern = cls.pattern
else:
pattern = r"""
%(delim)s(?:
(?P<escaped>%(delim)s) | # Escape sequence of two delimiters
(?P<named>%(id)s) | # delimiter and a Python identifier
{(?P<braced>%(bid)s)} | # delimiter and a braced identifier
(?P<invalid>) # Other ill-formed delimiter exprs
delim = _re.escape(cls.delimiter)
id = cls.idpattern
bid = cls.braceidpattern or cls.idpattern
pattern = fr"""
{delim}(?:
(?P<escaped>{delim}) | # Escape sequence of two delimiters
(?P<named>{id}) | # delimiter and a Python identifier
{{(?P<braced>{bid})}} | # delimiter and a braced identifier
(?P<invalid>) # Other ill-formed delimiter exprs
)
""" % {
'delim' : _re.escape(cls.delimiter),
'id' : cls.idpattern,
'bid' : cls.braceidpattern or cls.idpattern,
}
"""
cls.pattern = _re.compile(pattern, cls.flags | _re.VERBOSE)

def __init__(self, template):
Expand Down Expand Up @@ -142,7 +141,9 @@ def convert(mo):
self.pattern)
return self.pattern.sub(convert, self.template)

Template.__init_subclass__() # setup pattern
# Initialize Template.pattern. __init_subclass__() is automatically called
# only for subclasses, not for the Template class itself.
Template.__init_subclass__()


########################################################################
Expand Down