diff options
Diffstat (limited to 'Lib/encodings')
| -rw-r--r-- | Lib/encodings/__init__.py | 10 | ||||
| -rw-r--r-- | Lib/encodings/punycode.py | 8 | ||||
| -rw-r--r-- | Lib/encodings/utf_16.py | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index 221ba82..ed25e91 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -116,18 +116,16 @@ def search_function(encoding): entry = getregentry() if not isinstance(entry, codecs.CodecInfo): if not 4 <= len(entry) <= 7: - raise CodecRegistryError,\ - 'module "%s" (%s) failed to register' % \ - (mod.__name__, mod.__file__) + raise CodecRegistryError('module "%s" (%s) failed to register' + % (mod.__name__, mod.__file__)) if not hasattr(entry[0], '__call__') or \ not hasattr(entry[1], '__call__') or \ (entry[2] is not None and not hasattr(entry[2], '__call__')) or \ (entry[3] is not None and not hasattr(entry[3], '__call__')) or \ (len(entry) > 4 and entry[4] is not None and not hasattr(entry[4], '__call__')) or \ (len(entry) > 5 and entry[5] is not None and not hasattr(entry[5], '__call__')): - raise CodecRegistryError,\ - 'incompatible codecs in module "%s" (%s)' % \ - (mod.__name__, mod.__file__) + raise CodecRegistryError('incompatible codecs in module "%s" (%s)' + % (mod.__name__, mod.__file__)) if len(entry)<7 or entry[6] is None: entry += (None,)*(6-len(entry)) + (mod.__name__.split(".", 1)[1],) entry = codecs.CodecInfo(*entry) diff --git a/Lib/encodings/punycode.py b/Lib/encodings/punycode.py index f650f6c..f08c807 100644 --- a/Lib/encodings/punycode.py +++ b/Lib/encodings/punycode.py @@ -135,7 +135,7 @@ def decode_generalized_number(extended, extpos, bias, errors): char = ord(extended[extpos]) except IndexError: if errors == "strict": - raise UnicodeError, "incomplete punicode string" + raise UnicodeError("incomplete punicode string") return extpos + 1, None extpos += 1 if 0x41 <= char <= 0x5A: # A-Z @@ -172,7 +172,7 @@ def insertion_sort(base, extended, errors): char += pos // (len(base) + 1) if char > 0x10FFFF: if errors == "strict": - raise UnicodeError, ("Invalid character U+%x" % char) + raise UnicodeError("Invalid character U+%x" % char) char = ord('?') pos = pos % (len(base) + 1) base = base[:pos] + chr(char) + base[pos:] @@ -202,7 +202,7 @@ class Codec(codecs.Codec): def decode(self, input, errors='strict'): if errors not in ('strict', 'replace', 'ignore'): - raise UnicodeError, "Unsupported error handling "+errors + raise UnicodeError("Unsupported error handling "+errors) res = punycode_decode(input, errors) return res, len(input) @@ -213,7 +213,7 @@ class IncrementalEncoder(codecs.IncrementalEncoder): class IncrementalDecoder(codecs.IncrementalDecoder): def decode(self, input, final=False): if self.errors not in ('strict', 'replace', 'ignore'): - raise UnicodeError, "Unsupported error handling "+self.errors + raise UnicodeError("Unsupported error handling "+self.errors) return punycode_decode(input, self.errors) class StreamWriter(Codec,codecs.StreamWriter): diff --git a/Lib/encodings/utf_16.py b/Lib/encodings/utf_16.py index cf096b5..5500c06 100644 --- a/Lib/encodings/utf_16.py +++ b/Lib/encodings/utf_16.py @@ -132,7 +132,7 @@ class StreamReader(codecs.StreamReader): elif byteorder == 1: self.decode = codecs.utf_16_be_decode elif consumed>=2: - raise UnicodeError,"UTF-16 stream does not start with BOM" + raise UnicodeError("UTF-16 stream does not start with BOM") return (object, consumed) ### encodings module API |