From: Andrew M. Kuchling <amk@amk.ca>
Date: Sat, 13 Sep 2008 01:57:25 +0000 (+0000)
Subject: Update uses of string exceptions
X-Git-Tag: v2.6rc2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9a9c1066c64900a902f5a70b132880e29749ecc;p=thirdparty%2FPython%2Fcpython.git

Update uses of string exceptions
---

diff --git a/Demo/classes/bitvec.py b/Demo/classes/bitvec.py
index 495a83727a18..c0eafa0ddc03 100755
--- a/Demo/classes/bitvec.py
+++ b/Demo/classes/bitvec.py
@@ -21,7 +21,7 @@ def _compute_len(param):
     mant, l = math.frexp(float(param))
     bitmask = 1L << l
     if bitmask <= param:
-        raise 'FATAL', '(param, l) = %r' % ((param, l),)
+        raise RuntimeError('(param, l) = %r' % ((param, l),))
     while l:
         bitmask = bitmask >> 1
         if param & bitmask:
diff --git a/Demo/rpc/rpc.py b/Demo/rpc/rpc.py
index 0a14bf21308e..08ef2fb5c667 100644
--- a/Demo/rpc/rpc.py
+++ b/Demo/rpc/rpc.py
@@ -80,9 +80,9 @@ class Packer(xdr.Packer):
 
 
 # Exceptions
-BadRPCFormat = 'rpc.BadRPCFormat'
-BadRPCVersion = 'rpc.BadRPCVersion'
-GarbageArgs = 'rpc.GarbageArgs'
+class BadRPCFormat(Exception): pass
+class BadRPCVersion(Exception): pass
+class GarbageArgs(Exception): pass
 
 class Unpacker(xdr.Unpacker):
 
diff --git a/Demo/scripts/fact.py b/Demo/scripts/fact.py
index 6dafa66256f4..c030187e7b0c 100755
--- a/Demo/scripts/fact.py
+++ b/Demo/scripts/fact.py
@@ -8,10 +8,8 @@
 import sys
 from math import sqrt
 
-error = 'fact.error'            # exception
-
 def fact(n):
-    if n < 1: raise error   # fact() argument should be >= 1
+    if n < 1: raise ValueError # fact() argument should be >= 1
     if n == 1: return []    # special case
     res = []
     # Treat even factors special, so we can use i = i+2 later
diff --git a/Demo/threads/Coroutine.py b/Demo/threads/Coroutine.py
index 4cc65f7bf8d1..5de2b62d1b49 100644
--- a/Demo/threads/Coroutine.py
+++ b/Demo/threads/Coroutine.py
@@ -93,8 +93,8 @@ class _CoEvent:
         self.e.wait()
         self.e.clear()
 
-Killed = 'Coroutine.Killed'
-EarlyExit = 'Coroutine.EarlyExit'
+class Killed(Exception): pass
+class EarlyExit(Exception): pass
 
 class Coroutine:
     def __init__(self):