[Python-checkins] CVS: python/dist/src/Tools/idle AutoExpand.py,1.4,1.4.6.1 PyShell.py,1.34,1.34.2.1 UndoDelegator.py,1.3,1.3.12.1
Tim Peters
tim_one@users.sourceforge.net
2001年7月20日 23:07:16 -0700
Update of /cvsroot/python/python/dist/src/Tools/idle
In directory usw-pr-cvs1:/tmp/cvs-serv27169/descr/dist/src/Tools/idle
Modified Files:
Tag: descr-branch
AutoExpand.py PyShell.py UndoDelegator.py
Log Message:
Merge of trunk delta date2001-07-17b to date2001-07-21. See PLAN.txt.
Index: AutoExpand.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/AutoExpand.py,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -C2 -r1.4 -r1.4.6.1
*** AutoExpand.py 2001年01月02日 18:28:52 1.4
--- AutoExpand.py 2001年07月21日 06:07:14 1.4.6.1
***************
*** 22,26 ****
]
! wordchars = string.letters + string.digits + "_"
def __init__(self, editwin):
--- 22,26 ----
]
! wordchars = string.ascii_letters + string.digits + "_"
def __init__(self, editwin):
Index: PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/PyShell.py,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C2 -r1.34 -r1.34.2.1
*** PyShell.py 2001年07月06日 20:26:31 1.34
--- PyShell.py 2001年07月21日 06:07:14 1.34.2.1
***************
*** 37,40 ****
--- 37,43 ----
+ IDENTCHARS = string.ascii_letters + string.digits + "_"
+
+
# Note: <<newline-and-indent>> event is defined in AutoIndent.py
***************
*** 218,222 ****
text.see(pos)
char = text.get(pos)
! if char and char in string.letters + string.digits + "_":
text.tag_add("ERROR", pos + " wordstart", pos)
self.tkconsole.resetoutput()
--- 221,225 ----
text.see(pos)
char = text.get(pos)
! if char and char in IDENTCHARS:
text.tag_add("ERROR", pos + " wordstart", pos)
self.tkconsole.resetoutput()
Index: UndoDelegator.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/UndoDelegator.py,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -C2 -r1.3 -r1.3.12.1
*** UndoDelegator.py 1999年05月03日 15:49:52 1.3
--- UndoDelegator.py 2001年07月21日 06:07:14 1.3.12.1
***************
*** 252,256 ****
return 1
! alphanumeric = string.letters + string.digits + "_"
def classify(self, c):
--- 252,256 ----
return 1
! alphanumeric = string.ascii_letters + string.digits + "_"
def classify(self, c):