Fix raise with 2to3

M    idlelib/configHandler.py
M    idlelib/tabpage.py
M    idlelib/EditorWindow.py
M    idlelib/rpc.py
M    idlelib/IOBinding.py
M    idlelib/RemoteDebugger.py
M    idlelib/TreeWidget.py

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 2d11f90bc7edb34d947134edef8d5ab086351893..e051348b8b75a856d3f185d04e9d2f0e7162df05 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -38,7 +38,7 @@ def _find_module(fullname, path=None):
         try:
             path = module.__path__
         except AttributeError:
-            raise ImportError, 'No source for module ' + module.__name__
+            raise ImportError('No source for module ' + module.__name__)
     return file, filename, descr
 
 class EditorWindow(object):
@@ -955,14 +955,14 @@ class EditorWindow(object):
             value = var.get()
             return value
         else:
-            raise NameError, name
+            raise NameError(name)
 
     def setvar(self, name, value, vartype=None):
         var = self.get_var_obj(name, vartype)
         if var:
             var.set(value)
         else:
-            raise NameError, name
+            raise NameError(name)
 
     def get_var_obj(self, name, vartype=None):
         var = self.tkinter_vars.get(name)

diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
index 1be1a2113d27699450f9d4f3294078f8392880de..dd51062a1f8cbefd58535766b484af30c8119cb4 100644 (file)
--- a/Lib/idlelib/IOBinding.py
+++ b/Lib/idlelib/IOBinding.py
@@ -132,7 +132,7 @@ def coding_spec(str):
         codecs.lookup(name)
     except LookupError:
         # The standard encoding error does not indicate the encoding
-        raise LookupError, "Unknown encoding "+name
+        raise LookupError("Unknown encoding "+name)
     return name
 
 

diff --git a/Lib/idlelib/RemoteDebugger.py b/Lib/idlelib/RemoteDebugger.py
index 38583dbb08e3c0f94fc959940c4adfb47a84fcde..11bbc2d94bf401e0e8910b5f36630e9e799effb5 100644 (file)
--- a/Lib/idlelib/RemoteDebugger.py
+++ b/Lib/idlelib/RemoteDebugger.py
@@ -206,7 +206,7 @@ class FrameProxy:
 
     def __getattr__(self, name):
         if name[:1] == "_":
-            raise AttributeError, name
+            raise AttributeError(name)
         if name == "f_code":
             return self._get_f_code()
         if name == "f_globals":
@@ -270,7 +270,7 @@ class DictProxy:
 
     def __getattr__(self, name):
         ##print >>sys.__stderr__, "failed DictProxy.__getattr__:", name
-        raise AttributeError, name
+        raise AttributeError(name)
 
 
 class GUIAdapter:

diff --git a/Lib/idlelib/TreeWidget.py b/Lib/idlelib/TreeWidget.py
index 09cb71431478bc1be735719c95ebca9d51749226..c5084101baf34f2d39172b43e8eb33b84311c917 100644 (file)
--- a/Lib/idlelib/TreeWidget.py
+++ b/Lib/idlelib/TreeWidget.py
@@ -32,7 +32,7 @@ except NameError:
 if os.path.isdir(_icondir):
     ICONDIR = _icondir
 elif not os.path.isdir(ICONDIR):
-    raise RuntimeError, "can't find icon directory (%r)" % (ICONDIR,)
+    raise RuntimeError("can't find icon directory (%r)" % (ICONDIR,))
 
 def listicons(icondir=ICONDIR):
     """Utility to display the available icons."""

diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
index 2c9056ebca341a4cf7faa01687a8beee01576252..0c88396f690cd21998d9365eaf778c493c135727 100644 (file)
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -259,13 +259,13 @@ class IdleConf:
         configType must be one of ('main','extensions','highlight','keys')
         """
         if not (configType in ('main','extensions','highlight','keys')):
-            raise InvalidConfigType, 'Invalid configType specified'
+            raise InvalidConfigType('Invalid configType specified')
         if configSet == 'user':
             cfgParser=self.userCfg[configType]
         elif configSet == 'default':
             cfgParser=self.defaultCfg[configType]
         else:
-            raise InvalidConfigSet, 'Invalid configSet specified'
+            raise InvalidConfigSet('Invalid configSet specified')
         return cfgParser.sections()
 
     def GetHighlight(self, theme, element, fgBg=None):
@@ -293,7 +293,7 @@ class IdleConf:
             if fgBg == 'bg':
                 return highlight["background"]
             else:
-                raise InvalidFgBg, 'Invalid fgBg specified'
+                raise InvalidFgBg('Invalid fgBg specified')
 
     def GetThemeDict(self,type,themeName):
         """
@@ -309,7 +309,7 @@ class IdleConf:
         elif type == 'default':
             cfgParser=self.defaultCfg['highlight']
         else:
-            raise InvalidTheme, 'Invalid theme type specified'
+            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
         #by idle, to allow for their use in the future. Default values are
@@ -624,7 +624,7 @@ class IdleConf:
         elif configSet=='default':
             cfgParser=self.defaultCfg['main']
         else:
-            raise InvalidConfigSet, 'Invalid configSet specified'
+            raise InvalidConfigSet('Invalid configSet specified')
         options=cfgParser.GetOptionList('HelpFiles')
         for option in options:
             value=cfgParser.Get('HelpFiles',option,default=';')

diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index c75be10f718bdfd134a02ab514946f712390079d..eb262f4625cd11e8787a4f588a860c525945a1b2 100644 (file)
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -256,8 +256,8 @@ class SocketIO(object):
             return None
         if how == "ERROR":
             self.debug("decoderesponse: Internal ERROR:", what)
-            raise RuntimeError, what
-        raise SystemError, (how, what)
+            raise RuntimeError(what)
+        raise SystemError(how, what)
 
     def decode_interrupthook(self):
         ""
@@ -331,7 +331,7 @@ class SocketIO(object):
                 r, w, x = select.select([], [self.sock], [])
                 n = self.sock.send(s[:BUFSIZE])
             except (AttributeError, TypeError):
-                raise IOError, "socket no longer exists"
+                raise IOError("socket no longer exists")
             except socket.error:
                 raise
             else:
@@ -557,7 +557,7 @@ class RPCProxy(object):
                                            (name,), {})
             return value
         else:
-            raise AttributeError, name
+            raise AttributeError(name)
 
     def __getattributes(self):
         self.__attributes = self.sockio.remotecall(self.oid,

diff --git a/Lib/idlelib/tabpage.py b/Lib/idlelib/tabpage.py
index 12f89291da4dd3f8e54f5397a60ba52c29464a8c..0f7017be6d4b5441a3e3084ce4395b815bc5b7eb 100644 (file)
--- a/Lib/idlelib/tabpage.py
+++ b/Lib/idlelib/tabpage.py
@@ -46,7 +46,7 @@ class TabPageSet(Frame):
             if pageName in self.pages.keys():
                 self.activePage.set(pageName)
             else:
-                raise InvalidTabPage, 'Invalid TabPage Name'
+                raise InvalidTabPage('Invalid TabPage Name')
         ## pop up the active 'tab' only
         for page in self.pages.keys():
             self.pages[page]['tab'].config(relief=RIDGE)
@@ -59,7 +59,7 @@ class TabPageSet(Frame):
 
     def AddPage(self,pageName):
         if pageName in self.pages.keys():
-            raise AlreadyExists, 'TabPage Name Already Exists'
+            raise AlreadyExists('TabPage Name Already Exists')
         self.pages[pageName]={'tab':PageTab(self.tabBar),
                 'page':Frame(self,borderwidth=2,relief=RAISED)}
         self.pages[pageName]['tab'].button.config(text=pageName,
@@ -74,7 +74,7 @@ class TabPageSet(Frame):
 
     def RemovePage(self,pageName):
         if not pageName in self.pages.keys():
-            raise InvalidTabPage, 'Invalid TabPage Name'
+            raise InvalidTabPage('Invalid TabPage Name')
         self.pages[pageName]['tab'].pack_forget()
         self.pages[pageName]['page'].grid_forget()
         self.pages[pageName]['tab'].destroy()