[Idle-dev] CVS: idle tabpage.py,1.3,1.4 configHandler.py,1.25,1.26

[Neal Norwitz]

Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv2518

Modified Files:
	tabpage.py configHandler.py 
Log Message:
Convert string exceptions to classes, string exceptions are deprecated

Index: tabpage.py
===================================================================
RCS file: /cvsroot/idlefork/idle/tabpage.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** tabpage.py	3 Jan 2002 12:02:37 -0000	1.3
--- tabpage.py	30 Nov 2002 19:10:19 -0000	1.4
***************
*** 5,8 ****
--- 5,11 ----
  from Tkinter import *
  
+ class InvalidTabPage(Exception): pass
+ class AlreadyExists(Exception): pass
+ 
  class PageTab(Frame):
      """
***************
*** 44,48 ****
                  self.activePage.set(pageName)
              else:
!                 raise 'Invalid TabPage Name'
          ## pop up the active 'tab' only
          for page in self.pages.keys(): 
--- 47,51 ----
                  self.activePage.set(pageName)
              else:
!                 raise InvalidTabPage, 'Invalid TabPage Name'
          ## pop up the active 'tab' only
          for page in self.pages.keys(): 
***************
*** 57,61 ****
      def AddPage(self,pageName):
          if pageName in self.pages.keys():
!             raise 'TabPage Name Already Exists'
          self.pages[pageName]={'tab':PageTab(self.tabBar),
                  'page':Frame(self,borderwidth=2,relief=RAISED)}
--- 60,64 ----
      def AddPage(self,pageName):
          if pageName in self.pages.keys():
!             raise AlreadyExists, 'TabPage Name Already Exists'
          self.pages[pageName]={'tab':PageTab(self.tabBar),
                  'page':Frame(self,borderwidth=2,relief=RAISED)}
***************
*** 72,76 ****
      def RemovePage(self,pageName):
          if not pageName in self.pages.keys():
!             raise 'Invalid TabPage Name'
          self.pages[pageName]['tab'].pack_forget()
          self.pages[pageName]['page'].grid_forget()
--- 75,79 ----
      def RemovePage(self,pageName):
          if not pageName in self.pages.keys():
!             raise InvalidTabPage, 'Invalid TabPage Name'
          self.pages[pageName]['tab'].pack_forget()
          self.pages[pageName]['page'].grid_forget()

Index: configHandler.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configHandler.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** configHandler.py	26 Sep 2002 22:13:22 -0000	1.25
--- configHandler.py	30 Nov 2002 19:10:19 -0000	1.26
***************
*** 12,15 ****
--- 12,20 ----
  from ConfigParser import ConfigParser, NoOptionError, NoSectionError
  
+ class InvalidConfigType(Exception): pass
+ class InvalidConfigSet(Exception): pass
+ class InvalidFgBg(Exception): pass
+ class InvalidTheme(Exception): pass
+ 
  class IdleConfParser(ConfigParser):
      """
***************
*** 229,233 ****
          """
          if not (configType in ('main','extensions','highlight','keys')):
!             raise 'Invalid configType specified'
          if configSet == 'user':
              cfgParser=self.userCfg[configType]
--- 234,238 ----
          """
          if not (configType in ('main','extensions','highlight','keys')):
!             raise InvalidConfigType, 'Invalid configType specified'
          if configSet == 'user':
              cfgParser=self.userCfg[configType]
***************
*** 235,239 ****
              cfgParser=self.defaultCfg[configType]
          else:
!             raise 'Invalid configSet specified'
          return cfgParser.sections()
      
--- 240,244 ----
              cfgParser=self.defaultCfg[configType]
          else:
!             raise InvalidConfigSet, 'Invalid configSet specified'
          return cfgParser.sections()
      
***************
*** 263,267 ****
                  return highlight["background"]
              else:    
!                 raise 'Invalid fgBg specified'
  
      def GetThemeDict(self,type,themeName):
--- 268,272 ----
                  return highlight["background"]
              else:    
!                 raise InvalidFgBg, 'Invalid fgBg specified'
  
      def GetThemeDict(self,type,themeName):
***************
*** 279,283 ****
              cfgParser=self.defaultCfg['highlight']
          else:
!             raise 'Invalid theme type specified'
          #foreground and background values are provded for each theme element
          #(apart from cursor) even though all these values are not yet used
--- 284,288 ----
              cfgParser=self.defaultCfg['highlight']
          else:
!             raise InvalidTheme, 'Invalid theme type specified'
          #foreground and background values are provded for each theme element
          #(apart from cursor) even though all these values are not yet used
***************
*** 562,566 ****
              cfgParser=self.defaultCfg['main']
          else:
!             raise 'Invalid configSet specified'
          options=cfgParser.GetOptionList('HelpFiles')
          for option in options:
--- 567,571 ----
              cfgParser=self.defaultCfg['main']
          else:
!             raise InvalidConfigSet, 'Invalid configSet specified'
          options=cfgParser.GetOptionList('HelpFiles')
          for option in options: