diff options
-rw-r--r-- | Lib/DocXMLRPCServer.py | 8 | ||||
-rw-r--r-- | Lib/_LWPCookieJar.py | 6 | ||||
-rw-r--r-- | Lib/_MozillaCookieJar.py | 4 | ||||
-rw-r--r-- | Lib/os.py | 4 | ||||
-rw-r--r-- | Lib/test/test_optparse.py | 8 | ||||
-rw-r--r-- | Lib/urllib2.py | 6 | ||||
-rw-r--r-- | Lib/weakref.py | 16 |
7 files changed, 26 insertions, 26 deletions
diff --git a/Lib/DocXMLRPCServer.py b/Lib/DocXMLRPCServer.py index b900c5f..20958b2 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 2eb83a6..2c8d456 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 761a879..6d8df0d 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): """ @@ -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 254d1b4..172cca96 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 d93cba6..f1c94e1 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 77a41b1..c0669b0 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 |