[Python-checkins] CVS: python/dist/src/Tools/idle ColorDelegator.py,1.9,1.10 IdleConf.py,1.4,1.5 ParenMatch.py,1.3,1.4 PyShell.py,1.26,1.27 config.txt,1.1,1.2
Jeremy Hylton
jhylton@cnri.reston.va.us
Tue, 7 Mar 2000 12:55:35 -0500
Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory goon.cnri.reston.va.us:/home/jhylton/python/src/Tools/idle
Modified Files:
ColorDelegator.py IdleConf.py ParenMatch.py PyShell.py
config.txt
Log Message:
rename the global IdleConfParser object from IdleConf to idleconf
standard usage is now from IdleConf import idleconf
replace : with = in config.txt
Index: ColorDelegator.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ColorDelegator.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ColorDelegator.py 2000/03/03 23:06:44 1.9
--- ColorDelegator.py 2000/03/07 17:55:32 1.10
***************
*** 5,9 ****
from Tkinter import *
from Delegator import Delegator
! from IdleConf import IdleConf
#$ event <<toggle-auto-coloring>>
--- 5,9 ----
from Tkinter import *
from Delegator import Delegator
! from IdleConf import idleconf
#$ event <<toggle-auto-coloring>>
***************
*** 52,56 ****
self.tag_raise('sel')
! cconf = IdleConf.getsection('Colors')
tagdefs = {
--- 52,56 ----
self.tag_raise('sel')
! cconf = idleconf.getsection('Colors')
tagdefs = {
Index: IdleConf.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/IdleConf.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** IdleConf.py 2000/03/06 14:43:20 1.4
--- IdleConf.py 2000/03/07 17:55:32 1.5
***************
*** 45,50 ****
def reload(self):
! global IdleConf
! IdleConf = IdleConfParser()
load(_dir) # _dir is a global holding the last directory loaded
--- 45,50 ----
def reload(self):
! global idleconf
! idleconf = IdleConfParser()
load(_dir) # _dir is a global holding the last directory loaded
***************
*** 106,121 ****
except KeyError:
homedir = os.getcwd()
!
! for file in (os.path.join(dir, "config.txt"),
! genplatfile,
! platfile,
! os.path.join(homedir, ".idle"),
! ):
! try:
! f = open(file)
! except IOError:
! continue
! IdleConf.readfp(f)
! f.close()
- IdleConf = IdleConfParser()
--- 106,113 ----
except KeyError:
homedir = os.getcwd()
!
! idleconf.read((os.path.join(dir, "config.txt"), genplatfile, platfile,
! os.path.join(homedir, ".idle")))
!
! idleconf = IdleConfParser()
Index: ParenMatch.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ParenMatch.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ParenMatch.py 2000/03/06 14:16:41 1.3
--- ParenMatch.py 2000/03/07 17:55:32 1.4
***************
*** 15,19 ****
import PyParse
from AutoIndent import AutoIndent, index2line
! from IdleConf import IdleConf
class ParenMatch:
--- 15,19 ----
import PyParse
from AutoIndent import AutoIndent, index2line
! from IdleConf import idleconf
class ParenMatch:
***************
*** 57,62 ****
unix_keydefs = {}
! iconf = IdleConf.getsection('ParenMatch')
! STYLE = iconf.get('style')
FLASH_DELAY = iconf.getint('flash-delay')
HILITE_CONFIG = iconf.getcolor('hilite')
--- 57,62 ----
unix_keydefs = {}
! iconf = idleconf.getsection('ParenMatch')
! STYLE = iconf.getdef('style', 'default')
FLASH_DELAY = iconf.getint('flash-delay')
HILITE_CONFIG = iconf.getcolor('hilite')
Index: PyShell.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/PyShell.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** PyShell.py 2000/03/07 15:05:50 1.26
--- PyShell.py 2000/03/07 17:55:32 1.27
***************
*** 17,21 ****
from ColorDelegator import ColorDelegator
from OutputWindow import OutputWindow
! from IdleConf import IdleConf
import idlever
--- 17,21 ----
from ColorDelegator import ColorDelegator
from OutputWindow import OutputWindow
! from IdleConf import idleconf
import idlever
***************
*** 116,120 ****
tagdefs = ColorDelegator.tagdefs.copy()
! cconf = IdleConf.getsection('Colors')
tagdefs.update({
--- 116,120 ----
tagdefs = ColorDelegator.tagdefs.copy()
! cconf = idleconf.getsection('Colors')
tagdefs.update({
Index: config.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/config.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config.txt 2000/03/03 22:57:42 1.1
--- config.txt 2000/03/07 17:55:32 1.2
***************
*** 19,44 ****
[EditorWindow]
! width: 80
! height: 24
# fonts defined in config-[win/unix].txt
[Colors]
! normal-foreground: black
! normal-background: white
! # These color types are not explicitly defined: sync, todo, stdin
! keyword-foreground: #ff7700
! comment-foreground: #dd0000
! string-foreground: #00aa00
! definition-foreground: #0000ff
! hilite-foreground: #000068
! hilite-background: #006868
! break-foreground: #ff7777
! hit-foreground: #ffffff
! hit-background: #000000
! stdout-foreground: blue
! stderr-foreground: red
! console-foreground: #770000
! error-background: #ff7777
! cursor-background: black
[SearchBinding]
--- 19,44 ----
[EditorWindow]
! width= 80
! height= 24
# fonts defined in config-[win/unix].txt
[Colors]
! normal-foreground= black
! normal-background= white
! # These color types are not explicitly defined= sync, todo, stdin
! keyword-foreground= #ff7700
! comment-foreground= #dd0000
! string-foreground= #00aa00
! definition-foreground= #0000ff
! hilite-foreground= #000068
! hilite-background= #006868
! break-foreground= #ff7777
! hit-foreground= #ffffff
! hit-background= #000000
! stdout-foreground= blue
! stderr-foreground= red
! console-foreground= #770000
! error-background= #ff7777
! cursor-background= black
[SearchBinding]
***************
*** 57,64 ****
[ParenMatch]
! enable: 0 ; ParenMatch conflicts with CallTips
! style: expression
! flash-delay: 500
! bell: 1
! hilite-foreground: black
! hilite-background: #43cd80 ; SeaGreen3
--- 57,64 ----
[ParenMatch]
! enable= 0
! style= expression
! flash-delay= 500
! bell= 1
! hilite-foreground= black
! hilite-background= #43cd80