[Python-checkins] python/dist/src/Lib asyncore.py, 1.61, 1.62 shutil.py, 1.37, 1.38

nnorwitz@users.sourceforge.net nnorwitz at users.sourceforge.net
Thu Sep 1 02:45:39 CEST 2005


Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25272/Lib

Modified Files:
	asyncore.py shutil.py 
Log Message:
No need to import exceptions, they are builtins

Index: asyncore.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- asyncore.py	1 Sep 2004 14:04:51 -0000	1.61
+++ asyncore.py	1 Sep 2005 00:45:28 -0000	1.62
@@ -46,7 +46,6 @@
 sophisticated high-performance network servers and clients a snap.
 """
 
-import exceptions
 import select
 import socket
 import sys
@@ -61,7 +60,7 @@
 except NameError:
     socket_map = {}
 
-class ExitNow(exceptions.Exception):
+class ExitNow(Exception):
     pass
 
 def read(obj):

Index: shutil.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/shutil.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- shutil.py	31 Aug 2005 22:48:45 -0000	1.37
+++ shutil.py	1 Sep 2005 00:45:28 -0000	1.38
@@ -7,13 +7,12 @@
 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):



More information about the Python-checkins mailing list