Commit 33ad28b6 authored by Andrew M. Kuchling's avatar Andrew M. Kuchling

Use multi-line import

parent 3294e9d2
...@@ -16,10 +16,10 @@ import types ...@@ -16,10 +16,10 @@ import types
import re import re
import sys import sys
from SimpleXMLRPCServer import SimpleXMLRPCServer,\ from SimpleXMLRPCServer import (SimpleXMLRPCServer,
SimpleXMLRPCRequestHandler,\ SimpleXMLRPCRequestHandler,
CGIXMLRPCRequestHandler,\ CGIXMLRPCRequestHandler,
resolve_dotted_attribute resolve_dotted_attribute)
class ServerHTMLDoc(pydoc.HTMLDoc): class ServerHTMLDoc(pydoc.HTMLDoc):
"""Class used to generate pydoc HTML document for a server""" """Class used to generate pydoc HTML document for a server"""
......
...@@ -12,9 +12,9 @@ libwww-perl, I hope. ...@@ -12,9 +12,9 @@ libwww-perl, I hope.
""" """
import time, re, logging import time, re, logging
from cookielib import reraise_unmasked_exceptions, FileCookieJar, Cookie, \ from cookielib import (reraise_unmasked_exceptions, FileCookieJar, Cookie,
MISSING_FILENAME_TEXT, join_header_words, split_header_words, \ MISSING_FILENAME_TEXT, join_header_words, split_header_words,
iso2time, time2isoz iso2time, time2isoz)
def lwp_cookie_str(cookie): def lwp_cookie_str(cookie):
"""Return string representation of Cookie in an the LWP cookie file format. """Return string representation of Cookie in an the LWP cookie file format.
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
import re, time, logging import re, time, logging
from cookielib import reraise_unmasked_exceptions, FileCookieJar, Cookie, \ from cookielib import (reraise_unmasked_exceptions, FileCookieJar, Cookie,
MISSING_FILENAME_TEXT MISSING_FILENAME_TEXT)
class MozillaCookieJar(FileCookieJar): class MozillaCookieJar(FileCookieJar):
""" """
......
...@@ -130,8 +130,8 @@ else: ...@@ -130,8 +130,8 @@ else:
raise ImportError, 'no os specific module found' raise ImportError, 'no os specific module found'
sys.modules['os.path'] = path sys.modules['os.path'] = path
from os.path import curdir, pardir, sep, pathsep, defpath, extsep, altsep, \ from os.path import (curdir, pardir, sep, pathsep, defpath, extsep, altsep,
devnull devnull)
del _names del _names
......
...@@ -17,10 +17,10 @@ from cStringIO import StringIO ...@@ -17,10 +17,10 @@ from cStringIO import StringIO
from pprint import pprint from pprint import pprint
from test import test_support from test import test_support
from optparse import make_option, Option, IndentedHelpFormatter, \ from optparse import (make_option, Option, IndentedHelpFormatter,
TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, \ TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup,
SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, \ SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError,
BadOptionError, OptionValueError, _match_abbrev BadOptionError, OptionValueError, _match_abbrev)
class BaseTest(unittest.TestCase): class BaseTest(unittest.TestCase):
def assertParseOK(self, args, expected_opts, expected_positional_args): def assertParseOK(self, args, expected_opts, expected_positional_args):
......
...@@ -114,9 +114,9 @@ except ImportError: ...@@ -114,9 +114,9 @@ except ImportError:
from StringIO import StringIO from StringIO import StringIO
# not sure how many of these need to be gotten rid of # not sure how many of these need to be gotten rid of
from urllib import unwrap, unquote, splittype, splithost, \ from urllib import (unwrap, unquote, splittype, splithost,
addinfourl, splitport, splitgophertype, splitquery, \ addinfourl, splitport, splitgophertype, splitquery,
splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue)
# support for FileHandler, proxies via environment variables # support for FileHandler, proxies via environment variables
from urllib import localhost, url2pathname, getproxies from urllib import localhost, url2pathname, getproxies
......
...@@ -11,14 +11,14 @@ http://python.sourceforge.net/peps/pep-0205.html ...@@ -11,14 +11,14 @@ http://python.sourceforge.net/peps/pep-0205.html
import UserDict import UserDict
from _weakref import \ from _weakref import (
getweakrefcount, \ getweakrefcount,
getweakrefs, \ getweakrefs,
ref, \ ref,
proxy, \ proxy,
CallableProxyType, \ CallableProxyType,
ProxyType, \ ProxyType,
ReferenceType ReferenceType)
from exceptions import ReferenceError from exceptions import ReferenceError
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment