From: Andrew M. Kuchling <amk@amk.ca>
Date: Tue, 31 Aug 2004 11:38:12 +0000 (+0000)
Subject: Use multi-line import
X-Git-Tag: v2.4a3~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33ad28b68dd6caadc1e6cb8f917665d6270e7b25;p=python

Use multi-line import
---

diff --git a/Lib/DocXMLRPCServer.py b/Lib/DocXMLRPCServer.py
index b900c5fc5d..20958b26ef 100644
--- a/Lib/DocXMLRPCServer.py
+++ b/Lib/DocXMLRPCServer.py
@@ -16,10 +16,10 @@ import types
 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"""
diff --git a/Lib/_LWPCookieJar.py b/Lib/_LWPCookieJar.py
index 2eb83a6351..2c8d4564e0 100644
--- a/Lib/_LWPCookieJar.py
+++ b/Lib/_LWPCookieJar.py
@@ -12,9 +12,9 @@ libwww-perl, I hope.
 """
 
 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.
diff --git a/Lib/_MozillaCookieJar.py b/Lib/_MozillaCookieJar.py
index 761a879398..6d8df0d94a 100644
--- a/Lib/_MozillaCookieJar.py
+++ b/Lib/_MozillaCookieJar.py
@@ -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):
     """
diff --git a/Lib/os.py b/Lib/os.py
index 22f25a3cb4..6af4841414 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -130,8 +130,8 @@ else:
     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
 
diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index 254d1b4dc4..172cca968e 100644
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -17,10 +17,10 @@ from cStringIO import StringIO
 from pprint import pprint
 from test import test_support
 
-from optparse import make_option, Option, IndentedHelpFormatter, \
-     TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, \
-     SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, \
-     BadOptionError, OptionValueError, _match_abbrev
+from optparse import (make_option, Option, IndentedHelpFormatter, 
+     TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, 
+     SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, 
+     BadOptionError, OptionValueError, _match_abbrev)
 
 class BaseTest(unittest.TestCase):
     def assertParseOK(self, args, expected_opts, expected_positional_args):
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index d93cba62d8..f1c94e1110 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -114,9 +114,9 @@ except ImportError:
     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
diff --git a/Lib/weakref.py b/Lib/weakref.py
index 77a41b109c..c0669b0317 100644
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -11,14 +11,14 @@ http://python.sourceforge.net/peps/pep-0205.html
 
 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