From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 1 Sep 2005 00:45:28 +0000 (+0000)
Subject: No need to import exceptions, they are builtins
X-Git-Tag: v2.5a0~1412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ce69a5b06d230d513139ad0797bcc1b471f910c;p=thirdparty%2FPython%2Fcpython.git

No need to import exceptions, they are builtins
---

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index a2387a1a82b0..886c84545b10 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 d2e952343fa4..8a50ac13e844 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 14baa71e83a3..2fca61c164d3 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):