Fix more exception slicing.

diff --git a/Demo/pdist/cvslock.py b/Demo/pdist/cvslock.py
index a48c702ecc85eb6d9d166ee2dbb1ccb7a0542bbd..ffaa15e1d3351209a2f95e125233d19c272861e5 100755 (executable)
--- a/Demo/pdist/cvslock.py
+++ b/Demo/pdist/cvslock.py
@@ -131,7 +131,7 @@ class Lock:
                 return
             except os.error as msg:
                 self.lockdir = None
-                if msg[0] == EEXIST:
+                if msg.args[0] == EEXIST:
                     try:
                         st = os.stat(self.cvslck)
                     except os.error:

diff --git a/Demo/scripts/toaiff.py b/Demo/scripts/toaiff.py
index 57948591bb11c05dce0790bef4d52ae29b4a7bb4..0e9be23c0e3b6e50b94ac7a775c8f22953e4fc9a 100644 (file)
--- a/Demo/scripts/toaiff.py
+++ b/Demo/scripts/toaiff.py
@@ -89,8 +89,8 @@ def _toaiff(filename, temps):
             ftype = ftype[0] # All we're interested in
     except IOError as msg:
         if type(msg) == type(()) and len(msg) == 2 and \
-                type(msg[0]) == type(0) and type(msg[1]) == type(''):
-            msg = msg[1]
+                type(msg.args[0]) == type(0) and type(msg.args[1]) == type(''):
+            msg = msg.args[1]
         if type(msg) != type(''):
             msg = repr(msg)
         raise error(filename + ': ' + msg)

diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py
index e29e90e6d708017a0dee83dd4e7ee04d80b22846..69190601fbacb3e699c52f28cef72a5459dd9c80 100644 (file)
--- a/Lib/distutils/file_util.py
+++ b/Lib/distutils/file_util.py
@@ -139,7 +139,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
             macostools.copy(src, dst, 0, preserve_times)
         except os.error as exc:
             raise DistutilsFileError(
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1]))
+                  "could not copy '%s' to '%s': %s" % (src, dst, exc.args[-1]))
 
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)

diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py
index 0aee2bc3eb4cd4f74629daa1cbdd32087060093c..4c536d28af7c8237c27b676645ebaa8a113d0695 100644 (file)
--- a/Lib/distutils/spawn.py
+++ b/Lib/distutils/spawn.py
@@ -67,7 +67,7 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
         except OSError as exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError(
-                  "command '%s' failed: %s" % (cmd[0], exc[-1]))
+                  "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
         if rc != 0:
             # and this reflects the command running but failing
             raise DistutilsExecError(
@@ -88,7 +88,7 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
         except OSError as exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError(
-                  "command '%s' failed: %s" % (cmd[0], exc[-1]))
+                  "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
         if rc != 0:
             # and this reflects the command running but failing
             print("command '%s' failed with exit status %d" % (cmd[0], rc))
@@ -124,7 +124,7 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
                 if exc.errno == errno.EINTR:
                     continue
                 raise DistutilsExecError(
-                      "command '%s' failed: %s" % (cmd[0], exc[-1]))
+                      "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
             if os.WIFSIGNALED(status):
                 raise DistutilsExecError(
                       "command '%s' terminated by signal %d"

diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index 1f599ce39201d056d4915e1e7b3dfa21f7885472..12ba3ef6c16a00eabd88541b0e3c44993d2d7725 100644 (file)
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -149,12 +149,12 @@ class dircmp:
             try:
                 a_stat = os.stat(a_path)
             except os.error as why:
-                # print 'Can\'t stat', a_path, ':', why[1]
+                # print('Can\'t stat', a_path, ':', why.args[1])
                 ok = 0
             try:
                 b_stat = os.stat(b_path)
             except os.error as why:
-                # print 'Can\'t stat', b_path, ':', why[1]
+                # print('Can\'t stat', b_path, ':', why.args[1])
                 ok = 0
 
             if ok:

diff --git a/Lib/plat-mac/EasyDialogs.py b/Lib/plat-mac/EasyDialogs.py
index 2f0e3d3f39009f4d07d7a24dd83f7eb12d07a9b4..68beafa194fc88225ddd715af8eaa3e9881beca7 100644 (file)
--- a/Lib/plat-mac/EasyDialogs.py
+++ b/Lib/plat-mac/EasyDialogs.py
@@ -651,7 +651,7 @@ def AskFileForOpen(
         rr = Nav.NavChooseFile(args)
         good = 1
     except Nav.error as arg:
-        if arg[0] != -128: # userCancelledErr
+        if arg.args[0] != -128: # userCancelledErr
             raise Nav.error(arg)
         return None
     if not rr.validRecord or not rr.selection:
@@ -704,7 +704,7 @@ def AskFileForSave(
         rr = Nav.NavPutFile(args)
         good = 1
     except Nav.error as arg:
-        if arg[0] != -128: # userCancelledErr
+        if arg.args[0] != -128: # userCancelledErr
             raise Nav.error(arg)
         return None
     if not rr.validRecord or not rr.selection:
@@ -764,7 +764,7 @@ def AskFolder(
         rr = Nav.NavChooseFolder(args)
         good = 1
     except Nav.error as arg:
-        if arg[0] != -128: # userCancelledErr
+        if arg.args[0] != -128: # userCancelledErr
             raise Nav.error(arg)
         return None
     if not rr.validRecord or not rr.selection:

diff --git a/Lib/plat-mac/aetools.py b/Lib/plat-mac/aetools.py
index dd06e3ef46358a8eff0465245777c86cfb0bf411..7ba5074120ba80101dfd49743da1e5826ffb312e 100644 (file)
--- a/Lib/plat-mac/aetools.py
+++ b/Lib/plat-mac/aetools.py
@@ -86,7 +86,7 @@ def unpackevent(ae, formodulename=""):
         try:
             desc = ae.AEGetAttributeDesc(key, '****')
         except (AE.Error, MacOS.Error) as msg:
-            if msg[0] != -1701 and msg[0] != -1704:
+            if msg.args[0] not in (-1701, -1704):
                 raise
             continue
         attributes[key] = unpack(desc, formodulename)

diff --git a/Lib/plat-mac/gensuitemodule.py b/Lib/plat-mac/gensuitemodule.py
index 1864f4fdaec236deb64b3733603cec4685407024..9d4df6dd39dbc98700899cf927a533f9d16b67d7 100644 (file)
--- a/Lib/plat-mac/gensuitemodule.py
+++ b/Lib/plat-mac/gensuitemodule.py
@@ -191,7 +191,7 @@ def processfile(fullname, output=None, basepkgname=None,
     try:
         aedescobj, launched = OSATerminology.GetAppTerminology(fullname)
     except MacOS.Error as arg:
-        if arg[0] in (-1701, -192): # errAEDescNotFound, resNotFound
+        if arg.args[0] in (-1701, -192): # errAEDescNotFound, resNotFound
             if verbose:
                 print("GetAppTerminology failed with errAEDescNotFound/resNotFound, trying manually", file=verbose)
             aedata, sig = getappterminology(fullname, verbose=verbose)

diff --git a/Lib/plat-mac/terminalcommand.py b/Lib/plat-mac/terminalcommand.py
index a2f008c8daf4e1bf12992245dbbbfbf2061f337a..da1c28ad73d706ff3393ca921203e33c652d3160 100644 (file)
--- a/Lib/plat-mac/terminalcommand.py
+++ b/Lib/plat-mac/terminalcommand.py
@@ -36,7 +36,7 @@ def run(command):
     try:
         theEvent.AESend(SEND_MODE, kAENormalPriority, kAEDefaultTimeout)
     except AE.Error as why:
-        if why[0] != -600:  # Terminal.app not yet running
+        if why.args[0] != -600:  # Terminal.app not yet running
             raise
         os.system(START_TERMINAL)
         time.sleep(1)