Convert some old-style string exceptions to class exceptions.

diff --git a/Lib/plat-irix5/flp.py b/Lib/plat-irix5/flp.py
index 9f1957f93e680d04f06dda5f768fe4490314ee32..6c6dae513812bb412449c93652e9a5d971be1b13 100755 (executable)
--- a/Lib/plat-irix5/flp.py
+++ b/Lib/plat-irix5/flp.py
@@ -12,7 +12,8 @@ SPLITLINE = '--------------------'
 FORMLINE = '=============== FORM ==============='
 ENDLINE = '=============================='
 
-error = 'flp.error'
+class error(Exception):
+    pass
 
 ##################################################################
 #    Part 1 - The parsing routines                               #

diff --git a/Lib/plat-irix5/jpeg.py b/Lib/plat-irix5/jpeg.py
index 2e7ced56bfeecda2f3d8524cd356ce3c4a3ba6ca..298ebb5f79ef88d78150dfa06acdcc97e9813e48 100755 (executable)
--- a/Lib/plat-irix5/jpeg.py
+++ b/Lib/plat-irix5/jpeg.py
@@ -5,7 +5,8 @@
 # XXX It appears that compressing grayscale images doesn't work right;
 # XXX the resulting file causes weirdness.
 
-error = 'jpeg.error' # Exception
+class error(Exception):
+       pass
 
 options = {'quality': 75, 'optimize': 0, 'smooth': 0, 'forcegray': 0}
 

diff --git a/Lib/plat-irix5/readcd.py b/Lib/plat-irix5/readcd.py
index 5c4b824250bd88e58a123ab375a206a12cdccbfb..403353fdac434d85d4a16ada1001c1fecbba9f35 100755 (executable)
--- a/Lib/plat-irix5/readcd.py
+++ b/Lib/plat-irix5/readcd.py
@@ -2,8 +2,10 @@
 
 import cd, CD
 
-Error = 'Readcd.Error'
-_Stop = 'Readcd.Stop'
+class Error(Exception):
+       pass
+class _Stop(Exception):
+       pass
 
 def _doatime(self, cb_type, data):
        if ((data[0] * 60) + data[1]) * 75 + data[2] > self.end:

diff --git a/Lib/plat-irix5/torgb.py b/Lib/plat-irix5/torgb.py
index f283063c000c7936bc4b468db380c0e8e79c120d..59e3fbefba3ab0323b5394fc6ae03976af524693 100755 (executable)
--- a/Lib/plat-irix5/torgb.py
+++ b/Lib/plat-irix5/torgb.py
@@ -50,7 +50,8 @@ uncompress = pipes.Template()
 uncompress.append('uncompress', '--')
 
 
-error = 'torgb.error' # Exception
+class error(Exception):
+       pass
 
 def torgb(filename):
        temps = []

diff --git a/Lib/plat-irix6/flp.py b/Lib/plat-irix6/flp.py
index 9f1957f93e680d04f06dda5f768fe4490314ee32..6c6dae513812bb412449c93652e9a5d971be1b13 100644 (file)
--- a/Lib/plat-irix6/flp.py
+++ b/Lib/plat-irix6/flp.py
@@ -12,7 +12,8 @@ SPLITLINE = '--------------------'
 FORMLINE = '=============== FORM ==============='
 ENDLINE = '=============================='
 
-error = 'flp.error'
+class error(Exception):
+    pass
 
 ##################################################################
 #    Part 1 - The parsing routines                               #

diff --git a/Lib/plat-irix6/jpeg.py b/Lib/plat-irix6/jpeg.py
index c1ed669f97c5ea845207fbe2cd5669189c347917..1af6a013dda1fc0bdba3f5f35bc3eefbb937d702 100644 (file)
--- a/Lib/plat-irix6/jpeg.py
+++ b/Lib/plat-irix6/jpeg.py
@@ -5,7 +5,8 @@
 # XXX It appears that compressing grayscale images doesn't work right;
 # XXX the resulting file causes weirdness.
 
-error = 'jpeg.error' # Exception
+class error(Exception):
+       pass
 
 options = {'quality': 75, 'optimize': 0, 'smooth': 0, 'forcegray': 0}
 

diff --git a/Lib/plat-irix6/readcd.py b/Lib/plat-irix6/readcd.py
index 5c4b824250bd88e58a123ab375a206a12cdccbfb..403353fdac434d85d4a16ada1001c1fecbba9f35 100644 (file)
--- a/Lib/plat-irix6/readcd.py
+++ b/Lib/plat-irix6/readcd.py
@@ -2,8 +2,10 @@
 
 import cd, CD
 
-Error = 'Readcd.Error'
-_Stop = 'Readcd.Stop'
+class Error(Exception):
+       pass
+class _Stop(Exception):
+       pass
 
 def _doatime(self, cb_type, data):
        if ((data[0] * 60) + data[1]) * 75 + data[2] > self.end:

diff --git a/Lib/plat-irix6/torgb.py b/Lib/plat-irix6/torgb.py
index f283063c000c7936bc4b468db380c0e8e79c120d..59e3fbefba3ab0323b5394fc6ae03976af524693 100644 (file)
--- a/Lib/plat-irix6/torgb.py
+++ b/Lib/plat-irix6/torgb.py
@@ -50,7 +50,8 @@ uncompress = pipes.Template()
 uncompress.append('uncompress', '--')
 
 
-error = 'torgb.error' # Exception
+class error(Exception):
+       pass
 
 def torgb(filename):
        temps = []