diff options
| -rw-r--r-- | Lib/asyncore.py | 3 | ||||
| -rw-r--r-- | Lib/encodings/__init__.py | 5 | ||||
| -rw-r--r-- | Lib/shutil.py | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index a2387a1..886c845 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -46,7 +46,6 @@ many of the difficult problems for you, making the task of building sophisticated high-performance network servers and clients a snap. """ -import exceptions import select import socket import sys @@ -61,7 +60,7 @@ try: except NameError: socket_map = {} -class ExitNow(exceptions.Exception): +class ExitNow(Exception): pass def read(obj): diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index d2e9523..8a50ac1 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -27,7 +27,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com). """#" -import codecs, exceptions, types, aliases +import codecs, types, aliases _cache = {} _unknown = '--unknown--' @@ -40,8 +40,7 @@ _norm_encoding_map = (' . ' ' ') _aliases = aliases.aliases -class CodecRegistryError(exceptions.LookupError, - exceptions.SystemError): +class CodecRegistryError(LookupError, SystemError): pass def normalize_encoding(encoding): diff --git a/Lib/shutil.py b/Lib/shutil.py index 14baa71..2fca61c 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -7,13 +7,12 @@ XXX The functions here don't copy the resource fork or other metadata on Mac. import os import sys import stat -import exceptions from os.path import abspath __all__ = ["copyfileobj","copyfile","copymode","copystat","copy","copy2", "copytree","move","rmtree","Error"] -class Error(exceptions.EnvironmentError): +class Error(EnvironmentError): pass def copyfileobj(fsrc, fdst, length=16*1024): |