summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-08-17 04:45:13 (GMT)
committerFred Drake <fdrake@acm.org>2000-08-17 04:45:13 (GMT)
commit9b8d801c37fa29420848ebc1b50c601893b36287 (patch)
tree3e21590bf1bc994dc998ae3c7cadffd1e567ad61 /Lib
parentde9fec5f99179bfd023177b89238f8aaae98f1f9 (diff)
downloadcpython-9b8d801c37fa29420848ebc1b50c601893b36287.zip
cpython-9b8d801c37fa29420848ebc1b50c601893b36287.tar.gz
cpython-9b8d801c37fa29420848ebc1b50c601893b36287.tar.bz2
Convert some old-style string exceptions to class exceptions.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/sunau.py3
-rw-r--r--Lib/sunaudio.py3
-rw-r--r--Lib/toaiff.py3
-rw-r--r--Lib/tokenize.py5
-rwxr-xr-xLib/uu.py3
-rw-r--r--Lib/wave.py3
6 files changed, 14 insertions, 6 deletions
diff --git a/Lib/sunau.py b/Lib/sunau.py
index 940cfd4..5ece295 100644
--- a/Lib/sunau.py
+++ b/Lib/sunau.py
@@ -128,7 +128,8 @@ _simple_encodings = [AUDIO_FILE_ENCODING_MULAW_8,
AUDIO_FILE_ENCODING_LINEAR_32,
AUDIO_FILE_ENCODING_ALAW_8]
-Error = 'sunau.Error'
+class Error(Exception):
+ pass
def _read_u32(file):
x = 0L
diff --git a/Lib/sunaudio.py b/Lib/sunaudio.py
index b7df71c..cbd17d2 100644
--- a/Lib/sunaudio.py
+++ b/Lib/sunaudio.py
@@ -2,7 +2,8 @@
MAGIC = '.snd'
-error = 'sunaudio sound header conversion error'
+class error(Exception):
+ pass
def get_long_be(s):
diff --git a/Lib/toaiff.py b/Lib/toaiff.py
index 84a7786..52c5a89 100644
--- a/Lib/toaiff.py
+++ b/Lib/toaiff.py
@@ -53,7 +53,8 @@ uncompress = pipes.Template()
uncompress.append('uncompress', '--')
-error = 'toaiff.error' # Exception
+class error(Exception):
+ pass
def toaiff(filename):
temps = []
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 1383f21..a225211 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -76,7 +76,10 @@ endprogs = {"'": re.compile(Single), '"': re.compile(Double),
"R'''": single3prog, 'R"""': double3prog, 'r': None, 'R': None}
tabsize = 8
-TokenError = 'TokenError'
+
+class TokenError(Exception):
+ pass
+
def printtoken(type, token, (srow, scol), (erow, ecol), line): # for testing
print "%d,%d-%d,%d:\t%s\t%s" % \
(srow, scol, erow, ecol, tok_name[type], repr(token))
diff --git a/Lib/uu.py b/Lib/uu.py
index 252576d..e39b61b 100755
--- a/Lib/uu.py
+++ b/Lib/uu.py
@@ -35,7 +35,8 @@ import os
import string
import sys
-Error = 'uu.Error'
+class Error(Exception):
+ pass
def encode(in_file, out_file, name=None, mode=None):
"""Uuencode file"""
diff --git a/Lib/wave.py b/Lib/wave.py
index 60c0b98..c8cf997 100644
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -73,7 +73,8 @@ is destroyed.
import __builtin__
-Error = 'wave.Error'
+class Error(Exception):
+ pass
WAVE_FORMAT_PCM = 0x0001