Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4151 Modified Files: DocXMLRPCServer.py os.py _LWPCookieJar.py _MozillaCookieJar.py urllib2.py weakref.py Log Message: Use multi-line import Index: DocXMLRPCServer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/DocXMLRPCServer.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- DocXMLRPCServer.py 1 May 2003 05:05:08 -0000 1.3 +++ DocXMLRPCServer.py 31 Aug 2004 11:38:11 -0000 1.4 @@ -16,10 +16,10 @@ import re import sys -from SimpleXMLRPCServer import SimpleXMLRPCServer,\ - SimpleXMLRPCRequestHandler,\ - CGIXMLRPCRequestHandler,\ - resolve_dotted_attribute +from SimpleXMLRPCServer import (SimpleXMLRPCServer, + SimpleXMLRPCRequestHandler, + CGIXMLRPCRequestHandler, + resolve_dotted_attribute) class ServerHTMLDoc(pydoc.HTMLDoc): """Class used to generate pydoc HTML document for a server""" Index: os.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- os.py 29 Aug 2004 18:47:31 -0000 1.79 +++ os.py 31 Aug 2004 11:38:12 -0000 1.80 @@ -130,8 +130,8 @@ raise ImportError, 'no os specific module found' sys.modules['os.path'] = path -from os.path import curdir, pardir, sep, pathsep, defpath, extsep, altsep, \ - devnull +from os.path import (curdir, pardir, sep, pathsep, defpath, extsep, altsep, + devnull) del _names Index: _LWPCookieJar.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_LWPCookieJar.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- _LWPCookieJar.py 31 May 2004 18:22:40 -0000 1.1 +++ _LWPCookieJar.py 31 Aug 2004 11:38:12 -0000 1.2 @@ -12,9 +12,9 @@ """ import time, re, logging -from cookielib import reraise_unmasked_exceptions, FileCookieJar, Cookie, \ - MISSING_FILENAME_TEXT, join_header_words, split_header_words, \ - iso2time, time2isoz +from cookielib import (reraise_unmasked_exceptions, FileCookieJar, Cookie, + MISSING_FILENAME_TEXT, join_header_words, split_header_words, + iso2time, time2isoz) def lwp_cookie_str(cookie): """Return string representation of Cookie in an the LWP cookie file format. Index: _MozillaCookieJar.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_MozillaCookieJar.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- _MozillaCookieJar.py 31 May 2004 18:22:40 -0000 1.1 +++ _MozillaCookieJar.py 31 Aug 2004 11:38:12 -0000 1.2 @@ -2,8 +2,8 @@ import re, time, logging -from cookielib import reraise_unmasked_exceptions, FileCookieJar, Cookie, \ - MISSING_FILENAME_TEXT +from cookielib import (reraise_unmasked_exceptions, FileCookieJar, Cookie, + MISSING_FILENAME_TEXT) class MozillaCookieJar(FileCookieJar): """ Index: urllib2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- urllib2.py 8 Aug 2004 01:05:14 -0000 1.75 +++ urllib2.py 31 Aug 2004 11:38:12 -0000 1.76 @@ -114,9 +114,9 @@ from StringIO import StringIO # not sure how many of these need to be gotten rid of -from urllib import unwrap, unquote, splittype, splithost, \ - addinfourl, splitport, splitgophertype, splitquery, \ - splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue +from urllib import (unwrap, unquote, splittype, splithost, + addinfourl, splitport, splitgophertype, splitquery, + splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue) # support for FileHandler, proxies via environment variables from urllib import localhost, url2pathname, getproxies Index: weakref.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/weakref.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- weakref.py 19 Aug 2004 21:32:06 -0000 1.25 +++ weakref.py 31 Aug 2004 11:38:12 -0000 1.26 @@ -11,14 +11,14 @@ import UserDict -from _weakref import \ - getweakrefcount, \ - getweakrefs, \ - ref, \ - proxy, \ - CallableProxyType, \ - ProxyType, \ - ReferenceType +from _weakref import ( + getweakrefcount, + getweakrefs, + ref, + proxy, + CallableProxyType, + ProxyType, + ReferenceType) from exceptions import ReferenceError