From: Tim Peters Date: Wed, 1 Sep 2004 13:10:32 +0000 (+0000) Subject: Whitespace normalization. X-Git-Tag: v2.4a3~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b2cdad4fdd70129856eedb64676d239b86326ac;p=python Whitespace normalization. --- diff --git a/Lib/_MozillaCookieJar.py b/Lib/_MozillaCookieJar.py index 6d8df0d94a..0e08c09d6c 100644 --- a/Lib/_MozillaCookieJar.py +++ b/Lib/_MozillaCookieJar.py @@ -2,7 +2,7 @@ import re, time, logging -from cookielib import (reraise_unmasked_exceptions, FileCookieJar, Cookie, +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 6af4841414..20746e8250 100644 --- a/Lib/os.py +++ b/Lib/os.py @@ -130,7 +130,7 @@ else: raise ImportError, 'no os specific module found' 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) del _names diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py index 172cca968e..883194e953 100644 --- a/Lib/test/test_optparse.py +++ b/Lib/test/test_optparse.py @@ -17,9 +17,9 @@ 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, +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):