mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-28 09:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Use string.ascii_letters instead of string.letters (SF bug #226706).

Browse source 
Move computation of sets of characters out of the body of the function that
uses them.
This commit is contained in:
Fred Drake 2001-07-20 18:58:42 +00:00
parent 0f715d2aa1
commit cd694c44a9
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Tools/idle/PyShell.py
View file

@ -36,6 +36,9 @@ def linecache_checkcache(orig_checkcache=linecache.checkcache):
linecache.checkcache = linecache_checkcache linecache.checkcache = linecache_checkcache
IDENTCHARS = string.ascii_letters + string.digits + "_"
# Note: <<newline-and-indent>> event is defined in AutoIndent.py # Note: <<newline-and-indent>> event is defined in AutoIndent.py
#$ event <<plain-newline-and-indent>> #$ event <<plain-newline-and-indent>>
@ -217,7 +220,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
text.tag_add("ERROR", pos) text.tag_add("ERROR", pos)
text.see(pos) text.see(pos)
char = text.get(pos) char = text.get(pos)
if char and char in string.letters + string.digits + "_": if char and char in IDENTCHARS:
text.tag_add("ERROR", pos + " wordstart", pos) text.tag_add("ERROR", pos + " wordstart", pos)
self.tkconsole.resetoutput() self.tkconsole.resetoutput()
self.write("SyntaxError: %s\n" % str(msg)) self.write("SyntaxError: %s\n" % str(msg))

7
Tools/modulator/modulator.py
View file

@ -30,13 +30,16 @@ import string
oops = 'oops' oops = 'oops'
IDENTSTARTCHARS = string.ascii_letters + '_'
IDENTCHARS = string.ascii_letters + string.digits + '_'
# Check that string is a legal C identifier # Check that string is a legal C identifier
def checkid(str): def checkid(str):
if not str: return 0 if not str: return 0
if not str[0] in string.letters+'_': if not str[0] in IDENTSTARTCHARS:
return 0 return 0
for c in str[1:]: for c in str[1:]:
if not c in string.letters+string.digits+'_': if not c in IDENTCHARS:
return 0 return 0
return 1 return 1