From 1dd46a048f4afd9a3bc1e3c9c1603d26f2e33e27 Mon Sep 17 00:00:00 2001 From: Collin Winter Date: Wed, 22 Aug 2007 23:05:23 +0000 Subject: [PATCH] Convert raise statements in Mac/. --- .../applescript/Disk_Copy/Special_Events.py | 28 +++++++++---------- .../applescript/Disk_Copy/Standard_Suite.py | 6 ++-- .../applescript/Disk_Copy/Utility_Events.py | 26 ++++++++--------- Mac/Modules/cf/cfsupport.py | 6 ++-- Mac/Modules/file/filesupport.py | 2 +- Mac/Modules/list/listsupport.py | 2 +- Mac/Modules/te/tesupport.py | 2 +- .../Help_Indexing_Tool_Suite.py | 10 +++---- .../Miscellaneous_Standards.py | 4 +-- .../Doc/HelpIndexingTool/Standard_Suite.py | 26 ++++++++--------- .../Doc/HelpIndexingTool/odds_and_ends.py | 4 +-- 11 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Mac/Demo/applescript/Disk_Copy/Special_Events.py b/Mac/Demo/applescript/Disk_Copy/Special_Events.py index a2b09107dce..2c7e04f1450 100644 --- a/Mac/Demo/applescript/Disk_Copy/Special_Events.py +++ b/Mac/Demo/applescript/Disk_Copy/Special_Events.py @@ -43,7 +43,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -72,7 +72,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -85,14 +85,14 @@ class Special_Events_Events: _code = 'ddsk' _subcode = 'Umnt' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -131,7 +131,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -145,14 +145,14 @@ class Special_Events_Events: _code = 'ddsk' _subcode = 'Vcrc' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -166,14 +166,14 @@ class Special_Events_Events: _code = 'ddsk' _subcode = 'Vsig' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -199,7 +199,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -231,7 +231,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -258,7 +258,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -290,7 +290,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -331,7 +331,7 @@ class Special_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] diff --git a/Mac/Demo/applescript/Disk_Copy/Standard_Suite.py b/Mac/Demo/applescript/Disk_Copy/Standard_Suite.py index 455e78dfa9f..2dad9479901 100644 --- a/Mac/Demo/applescript/Disk_Copy/Standard_Suite.py +++ b/Mac/Demo/applescript/Disk_Copy/Standard_Suite.py @@ -58,7 +58,7 @@ class Standard_Suite_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -71,14 +71,14 @@ class Standard_Suite_Events: _code = 'core' _subcode = 'dosc' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] diff --git a/Mac/Demo/applescript/Disk_Copy/Utility_Events.py b/Mac/Demo/applescript/Disk_Copy/Utility_Events.py index 172b40819c8..03df9387a36 100644 --- a/Mac/Demo/applescript/Disk_Copy/Utility_Events.py +++ b/Mac/Demo/applescript/Disk_Copy/Utility_Events.py @@ -26,14 +26,14 @@ class Utility_Events_Events: _subcode = 'SEL1' aetools.keysubst(_arguments, self._argmap_select_disk_image) - if _no_object != None: raise TypeError, 'No direct arg expected' + if _no_object != None: raise TypeError('No direct arg expected') aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT) _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -52,14 +52,14 @@ class Utility_Events_Events: _subcode = 'SEL2' aetools.keysubst(_arguments, self._argmap_select_DiskScript) - if _no_object != None: raise TypeError, 'No direct arg expected' + if _no_object != None: raise TypeError('No direct arg expected') aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT) _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -78,14 +78,14 @@ class Utility_Events_Events: _subcode = 'SEL3' aetools.keysubst(_arguments, self._argmap_select_disk_image_or_DiskScript) - if _no_object != None: raise TypeError, 'No direct arg expected' + if _no_object != None: raise TypeError('No direct arg expected') aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT) _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -104,14 +104,14 @@ class Utility_Events_Events: _subcode = 'SEL4' aetools.keysubst(_arguments, self._argmap_select_floppy_disk_image) - if _no_object != None: raise TypeError, 'No direct arg expected' + if _no_object != None: raise TypeError('No direct arg expected') aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT) _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -130,14 +130,14 @@ class Utility_Events_Events: _subcode = 'SEL5' aetools.keysubst(_arguments, self._argmap_select_disk) - if _no_object != None: raise TypeError, 'No direct arg expected' + if _no_object != None: raise TypeError('No direct arg expected') aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT) _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -156,14 +156,14 @@ class Utility_Events_Events: _subcode = 'SEL6' aetools.keysubst(_arguments, self._argmap_select_folder) - if _no_object != None: raise TypeError, 'No direct arg expected' + if _no_object != None: raise TypeError('No direct arg expected') aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT) _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -189,7 +189,7 @@ class Utility_Events_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.has_key('errn'): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] diff --git a/Mac/Modules/cf/cfsupport.py b/Mac/Modules/cf/cfsupport.py index 655331eb2a8..23c85981ff2 100644 --- a/Mac/Modules/cf/cfsupport.py +++ b/Mac/Modules/cf/cfsupport.py @@ -24,14 +24,14 @@ class MethodSkipArg1(MethodGenerator): def parseArgumentList(self, args): if len(args) < 2: - raise ValueError, "MethodSkipArg1 expects at least 2 args" + raise ValueError("MethodSkipArg1 expects at least 2 args") a0, a1, args = args[0], args[1], args[2:] t0, n0, m0 = a0 if t0 != "CFAllocatorRef" and m0 != InMode: - raise ValueError, "MethodSkipArg1 should have dummy AllocatorRef first arg" + raise ValueError("MethodSkipArg1 should have dummy AllocatorRef first arg") t1, n1, m1 = a1 if m1 != InMode: - raise ValueError, "method's 'self' must be 'InMode'" + raise ValueError("method's 'self' must be 'InMode'") dummy = Variable(t0, n0, m0) self.argumentList.append(dummy) self.itself = Variable(t1, "_self->ob_itself", SelfMode) diff --git a/Mac/Modules/file/filesupport.py b/Mac/Modules/file/filesupport.py index de45ed40420..82117242eef 100644 --- a/Mac/Modules/file/filesupport.py +++ b/Mac/Modules/file/filesupport.py @@ -774,7 +774,7 @@ class Arg2MethodGenerator(OSErrMethodGenerator): t0, n0, m0 = arg1 args = args0 + argsrest if m0 != InMode: - raise ValueError, "method's 'self' must be 'InMode'" + raise ValueError("method's 'self' must be 'InMode'") self.itself = Variable(t0, "_self->ob_itself", SelfMode) FunctionGenerator.parseArgumentList(self, args) self.argumentList.insert(2, self.itself) diff --git a/Mac/Modules/list/listsupport.py b/Mac/Modules/list/listsupport.py index 2e1144a9b64..1c122065cb9 100644 --- a/Mac/Modules/list/listsupport.py +++ b/Mac/Modules/list/listsupport.py @@ -70,7 +70,7 @@ class ListMethodGenerator(MethodGenerator): args, a0 = args[:-1], args[-1] t0, n0, m0 = a0 if m0 != InMode: - raise ValueError, "method's 'self' must be 'InMode'" + raise ValueError("method's 'self' must be 'InMode'") self.itself = Variable(t0, "_self->ob_itself", SelfMode) FunctionGenerator.parseArgumentList(self, args) self.argumentList.append(self.itself) diff --git a/Mac/Modules/te/tesupport.py b/Mac/Modules/te/tesupport.py index 412d5e72346..96c9604c7df 100644 --- a/Mac/Modules/te/tesupport.py +++ b/Mac/Modules/te/tesupport.py @@ -82,7 +82,7 @@ class TEMethodGenerator(OSErrWeakLinkMethodGenerator): args, a0 = args[:-1], args[-1] t0, n0, m0 = a0 if m0 != InMode: - raise ValueError, "method's 'self' must be 'InMode'" + raise ValueError("method's 'self' must be 'InMode'") self.itself = Variable(t0, "_self->ob_itself", SelfMode) FunctionGenerator.parseArgumentList(self, args) self.argumentList.append(self.itself) diff --git a/Mac/Tools/Doc/HelpIndexingTool/Help_Indexing_Tool_Suite.py b/Mac/Tools/Doc/HelpIndexingTool/Help_Indexing_Tool_Suite.py index 58d73076dfb..9b3ace4631b 100644 --- a/Mac/Tools/Doc/HelpIndexingTool/Help_Indexing_Tool_Suite.py +++ b/Mac/Tools/Doc/HelpIndexingTool/Help_Indexing_Tool_Suite.py @@ -20,14 +20,14 @@ class Help_Indexing_Tool_Suite_Events: _code = 'HIT ' _subcode = 'tAnc' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -52,7 +52,7 @@ class Help_Indexing_Tool_Suite_Events: _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -65,14 +65,14 @@ class Help_Indexing_Tool_Suite_Events: _code = 'HIT ' _subcode = 'uTok' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] diff --git a/Mac/Tools/Doc/HelpIndexingTool/Miscellaneous_Standards.py b/Mac/Tools/Doc/HelpIndexingTool/Miscellaneous_Standards.py index 3cf745f9860..616ae70b4a2 100644 --- a/Mac/Tools/Doc/HelpIndexingTool/Miscellaneous_Standards.py +++ b/Mac/Tools/Doc/HelpIndexingTool/Miscellaneous_Standards.py @@ -20,14 +20,14 @@ class Miscellaneous_Standards_Events: _code = 'misc' _subcode = 'rvrt' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] diff --git a/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py b/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py index 4f6604cfebe..140e8b98fd2 100644 --- a/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py +++ b/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py @@ -36,7 +36,7 @@ class Standard_Suite_Events(Standard_Suite_Events): _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -50,14 +50,14 @@ class Standard_Suite_Events(Standard_Suite_Events): _code = 'core' _subcode = 'dsiz' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -71,14 +71,14 @@ class Standard_Suite_Events(Standard_Suite_Events): _code = 'core' _subcode = 'getd' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -103,13 +103,13 @@ class Standard_Suite_Events(Standard_Suite_Events): _subcode = 'crel' aetools.keysubst(_arguments, self._argmap_make) - if _no_object != None: raise TypeError, 'No direct arg expected' + if _no_object != None: raise TypeError('No direct arg expected') _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -122,14 +122,14 @@ class Standard_Suite_Events(Standard_Suite_Events): _code = 'aevt' _subcode = 'odoc' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -142,14 +142,14 @@ class Standard_Suite_Events(Standard_Suite_Events): _code = 'aevt' _subcode = 'pdoc' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -176,7 +176,7 @@ class Standard_Suite_Events(Standard_Suite_Events): _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] @@ -201,7 +201,7 @@ class Standard_Suite_Events(Standard_Suite_Events): _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----'] diff --git a/Mac/Tools/Doc/HelpIndexingTool/odds_and_ends.py b/Mac/Tools/Doc/HelpIndexingTool/odds_and_ends.py index 7ee46f35cc2..86ecb95c963 100644 --- a/Mac/Tools/Doc/HelpIndexingTool/odds_and_ends.py +++ b/Mac/Tools/Doc/HelpIndexingTool/odds_and_ends.py @@ -20,14 +20,14 @@ class odds_and_ends_Events: _code = 'misc' _subcode = 'slct' - if _arguments: raise TypeError, 'No optional args expected' + if _arguments: raise TypeError('No optional args expected') _arguments['----'] = _object _reply, _arguments, _attributes = self.send(_code, _subcode, _arguments, _attributes) if _arguments.get('errn', 0): - raise aetools.Error, aetools.decodeerror(_arguments) + raise aetools.Error(aetools.decodeerror(_arguments)) # XXXX Optionally decode result if _arguments.has_key('----'): return _arguments['----']