[Python-checkins] CVS: python/dist/src/Tools/scripts fixheader.py,1.3.6.1,1.3.6.2 texi2html.py,1.12.6.1,1.12.6.2

2001年7月20日 23:07:16 -0700

Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv27169/descr/dist/src/Tools/scripts
Modified Files:
 Tag: descr-branch
	fixheader.py texi2html.py 
Log Message:
Merge of trunk delta date2001-07-17b to date2001-07-21. See PLAN.txt.
Index: fixheader.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/fixheader.py,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** fixheader.py	2001年07月06日 17:08:49	1.3.6.1
--- fixheader.py	2001年07月21日 06:07:14	1.3.6.2
***************
*** 30,34 ****
 magic = 'Py_'
 for c in file:
! if c in string.letters + string.digits:
 magic = magic + string.upper(c)
 else: magic = magic + '_'
--- 30,34 ----
 magic = 'Py_'
 for c in file:
! if c in string.ascii_letters + string.digits:
 magic = magic + string.upper(c)
 else: magic = magic + '_'
Index: texi2html.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/texi2html.py,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -C2 -r1.12.6.1 -r1.12.6.2
*** texi2html.py	2001年07月06日 17:08:49	1.12.6.1
--- texi2html.py	2001年07月21日 06:07:14	1.12.6.2
***************
*** 423,427 ****
 raise RuntimeError, 'unexpected funny '+`c`
 start = i
! while i < n and text[i] in string.letters: i = i+1
 if i == start:
 # @ plus non-letter: literal next character
--- 423,427 ----
 raise RuntimeError, 'unexpected funny '+`c`
 start = i
! while i < n and text[i] in string.ascii_letters: i = i+1
 if i == start:
 # @ plus non-letter: literal next character
***************
*** 1261,1265 ****
 if self.itemarg:
 if self.itemarg[0] == '@' and self.itemarg[1:2] and \
! self.itemarg[1] in string.letters:
 args = self.itemarg + '{' + args + '}'
 else:
--- 1261,1265 ----
 if self.itemarg:
 if self.itemarg[0] == '@' and self.itemarg[1:2] and \
! self.itemarg[1] in string.ascii_letters:
 args = self.itemarg + '{' + args + '}'
 else:
***************
*** 1525,1529 ****
 
 # Characters that are perfectly safe in filenames and hyperlinks
! goodchars = string.letters + string.digits + '!@-=+.'
 
 # Replace characters that aren't perfectly safe by dashes
--- 1525,1529 ----
 
 # Characters that are perfectly safe in filenames and hyperlinks
! goodchars = string.ascii_letters + string.digits + '!@-=+.'
 
 # Replace characters that aren't perfectly safe by dashes