traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whitespace normalization.

This commit is contained in:
Tim Peters 2003-02-19 02:35:07 +00:00
parent f805cd2c1f
commit f2715e0764
26 changed files with 110 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/cmd.py
View File

@ -79,9 +79,9 @@ class Cmd:
def __init__(self, completekey='tab', stdin=None, stdout=None):
"""Instantiate a line-oriented interpreter framework.
The optional argument 'completekey' is the readline name of a
completion key; it defaults to the Tab key. If completekey is
not None and the readline module is available, command completion
The optional argument 'completekey' is the readline name of a
completion key; it defaults to the Tab key. If completekey is
not None and the readline module is available, command completion
is done automatically. The optional arguments stdin and stdout
specify alternate input and output file objects; if not specified,
sys.stdin and sys.stdout are used.

2
Lib/copy.py
View File

@ -93,7 +93,7 @@ def copy(x):
raise Error("un(shallow)copyable object of type %s" % cls)
return _reconstruct(x, rv, 0)
_copy_dispatch = d = {}

12
Lib/os.py
View File

@ -44,7 +44,7 @@ if 'posix' in _names:
except ImportError:
pass
import posixpath as path
import posix
__all__.extend(_get_exports_list(posix))
del posix
@ -58,7 +58,7 @@ elif 'nt' in _names:
except ImportError:
pass
import ntpath as path
import nt
__all__.extend(_get_exports_list(nt))
del nt
@ -75,7 +75,7 @@ elif 'os2' in _names:
import ntpath as path
else:
import os2emxpath as path
import os2
__all__.extend(_get_exports_list(os2))
del os2
@ -89,7 +89,7 @@ elif 'mac' in _names:
except ImportError:
pass
import macpath as path
import mac
__all__.extend(_get_exports_list(mac))
del mac
@ -104,7 +104,7 @@ elif 'ce' in _names:
pass
# We can use the standard Windows path.
import ntpath as path
import ce
__all__.extend(_get_exports_list(ce))
del ce
@ -118,7 +118,7 @@ elif 'riscos' in _names:
except ImportError:
pass
import riscospath as path
import riscos
__all__.extend(_get_exports_list(riscos))
del riscos

2
Lib/test/re_tests.py
View File

@ -553,7 +553,7 @@ tests = [
# escaping with \ as we know it
('(?<!\\\):(.*?)(?<!\\\):', 'a:bc\\:de:f', SUCCEED, 'g1', 'bc\\:de' ),
# terminating with ' and escaping with ? as in edifact
("(?<!\\?)'(.*?)(?<!\\?)'", "a'bc?'de'f", SUCCEED, 'g1', "bc?'de" ),
("(?<!\\?)'(.*?)(?<!\\?)'", "a'bc?'de'f", SUCCEED, 'g1', "bc?'de" ),
# Comments using the (?#...) syntax

2
Lib/test/regrtest.py
View File

@ -933,7 +933,7 @@ class _ExpectedSkips:
if sys.platform != "win32":
self.expected.add("test_winreg")
self.expected.add("test_winsound")
self.valid = True
def isvalid(self):

6
Lib/test/test_aepack.py
View File

@ -53,7 +53,7 @@ class TestAepack(unittest.TestCase):
packed = aepack.pack(o)
unpacked = aepack.unpack(packed)
self.assertEqual(repr(o), repr(unpacked))
def test_roundtrip_FSSpec(self):
try:
import Carbon.File
@ -72,9 +72,9 @@ class TestAepack(unittest.TestCase):
o = Carbon.File.FSSpec(os.curdir).NewAliasMinimal()
packed = aepack.pack(o)
unpacked = aepack.unpack(packed)
self.assertEqual(o.FSResolveAlias(None)[0].as_pathname(),
self.assertEqual(o.FSResolveAlias(None)[0].as_pathname(),
unpacked.FSResolveAlias(None)[0].as_pathname())
def test_main():
test_support.run_unittest(TestAepack)

1
Lib/test/test_bisect.py
View File

@ -214,4 +214,3 @@ def test_main(verbose=None):
if __name__ == "__main__":
test_main(verbose=True)

30
Lib/test/test_builtin.py
View File

@ -352,10 +352,10 @@ class BuiltinTest(unittest.TestCase):
filter(identity, Squares(5))
self.assertRaises(TypeError, filter)
class BadSeq(object):
def __getitem__(self, index):
if index<4:
return 42
raise ValueError
def __getitem__(self, index):
if index<4:
return 42
raise ValueError
self.assertRaises(ValueError, filter, lambda x: x, BadSeq())
def badfunc():
pass
@ -441,13 +441,13 @@ class BuiltinTest(unittest.TestCase):
for (cls, inps) in inputs.iteritems():
for (inp, exp) in inps.iteritems():
# make sure the output goes through __getitem__
# even if func is None
self.assertEqual(
filter(funcs[0], cls(inp)),
filter(funcs[1], cls(inp))
)
for func in funcs:
# make sure the output goes through __getitem__
# even if func is None
self.assertEqual(
filter(funcs[0], cls(inp)),
filter(funcs[1], cls(inp))
)
for func in funcs:
outp = filter(func, cls(inp))
self.assertEqual(outp, exp)
self.assert_(not isinstance(outp, cls))
@ -1039,10 +1039,10 @@ class BuiltinTest(unittest.TestCase):
self.assertRaises(TypeError, round)
def test_setattr(self):
setattr(sys, 'spam', 1)
self.assertEqual(sys.spam, 1)
self.assertRaises(TypeError, setattr, sys, 1, 'spam')
self.assertRaises(TypeError, setattr)
setattr(sys, 'spam', 1)
self.assertEqual(sys.spam, 1)
self.assertRaises(TypeError, setattr, sys, 1, 'spam')
self.assertRaises(TypeError, setattr)
def test_str(self):
self.assertEqual(str(''), '')

4
Lib/test/test_codeccallbacks.py
View File

@ -11,7 +11,7 @@ class PosReturn:
oldpos = self.pos
realpos = oldpos
if realpos<0:
realpos = len(exc.object) + realpos
realpos = len(exc.object) + realpos
# if we don't advance this time, terminate on the next call
# otherwise we'd get an endless loop
if realpos <= exc.start:
@ -532,7 +532,7 @@ class CodecCallbackTest(unittest.TestCase):
# and inline implementations
v = (1, 5, 10, 50, 100, 500, 1000, 5000, 10000, 50000)
if sys.maxunicode>=100000:
v += (100000, 500000, 1000000)
v += (100000, 500000, 1000000)
s = u"".join([unichr(x) for x in v])
codecs.register_error("test.xmlcharrefreplace", codecs.xmlcharrefreplace_errors)
for enc in ("ascii", "iso-8859-15"):

22
Lib/test/test_datetime.py
View File

@ -103,9 +103,9 @@ class TestTZInfo(unittest.TestCase):
orig = tzinfo.__new__(tzinfo)
self.failUnless(type(orig) is tzinfo)
for pickler, unpickler, proto in pickle_choices:
green = pickler.dumps(orig, proto)
derived = unpickler.loads(green)
self.failUnless(type(derived) is tzinfo)
green = pickler.dumps(orig, proto)
derived = unpickler.loads(green)
self.failUnless(type(derived) is tzinfo)
def test_pickling_subclass(self):
# Make sure we can pickle/unpickle an instance of a subclass.
@ -116,12 +116,12 @@ class TestTZInfo(unittest.TestCase):
self.assertEqual(orig.utcoffset(None), offset)
self.assertEqual(orig.tzname(None), 'cookie')
for pickler, unpickler, proto in pickle_choices:
green = pickler.dumps(orig, proto)
derived = unpickler.loads(green)
self.failUnless(isinstance(derived, tzinfo))
self.failUnless(type(derived) is PicklableFixedOffset)
self.assertEqual(derived.utcoffset(None), offset)
self.assertEqual(derived.tzname(None), 'cookie')
green = pickler.dumps(orig, proto)
derived = unpickler.loads(green)
self.failUnless(isinstance(derived, tzinfo))
self.failUnless(type(derived) is PicklableFixedOffset)
self.assertEqual(derived.utcoffset(None), offset)
self.assertEqual(derived.tzname(None), 'cookie')
#############################################################################
# Base clase for testing a particular aspect of timedelta, time, date and
@ -517,8 +517,8 @@ class TestDate(HarmlessMixedComparison):
fromord = self.theclass.fromordinal(n)
self.assertEqual(d, fromord)
if hasattr(fromord, "hour"):
# if we're checking something fancier than a date, verify
# the extra fields have been zeroed out
# if we're checking something fancier than a date, verify
# the extra fields have been zeroed out
self.assertEqual(fromord.hour, 0)
self.assertEqual(fromord.minute, 0)
self.assertEqual(fromord.second, 0)

2
Lib/test/test_descr.py
View File

@ -1837,7 +1837,7 @@ def specials():
def __str__(self):
if not self:
return 'EPS'
return self
return self
# sys.stdout needs to be the original to trigger the recursion bug
import sys

10
Lib/test/test_dummy_thread.py
View File

@ -31,7 +31,7 @@ class LockTests(unittest.TestCase):
self.lock.release()
self.failUnless(not self.lock.locked(),
"Lock object did not release properly.")
def test_improper_release(self):
#Make sure release of an unlocked thread raises _thread.error
self.failUnlessRaises(_thread.error, self.lock.release)
@ -58,7 +58,7 @@ class LockTests(unittest.TestCase):
#Make sure that an unconditional locking returns True.
self.failUnless(self.lock.acquire(1) is True,
"Unconditional locking did not return True.")
def test_uncond_acquire_blocking(self):
#Make sure that unconditional acquiring of a locked lock blocks.
def delay_unlock(to_unlock, delay):
@ -125,14 +125,14 @@ class ThreadTests(unittest.TestCase):
self.failUnless(result[0] and result[1],
"Argument passing for thread creation using both tuple"
" and kwargs failed")
def test_multi_creation(self):
#Make sure multiple threads can be created.
def queue_mark(queue, delay):
"""Wait for ``delay`` seconds and then put something into ``queue``"""
time.sleep(delay)
queue.put(_thread.get_ident())
thread_count = 5
delay = 1.5
testing_queue = Queue.Queue(thread_count)
@ -147,7 +147,7 @@ class ThreadTests(unittest.TestCase):
if test_support.verbose:
print 'done'
self.failUnless(testing_queue.qsize() == thread_count,
"Not all %s threads executed properly after %s sec." %
"Not all %s threads executed properly after %s sec." %
(thread_count, delay))
def test_main(imported_module=None):

4
Lib/test/test_dummy_threading.py
View File

@ -9,7 +9,7 @@ import time
class TestThread(_threading.Thread):
def run(self):
global running
delay = random.random() * 2
@ -54,7 +54,7 @@ def test_main():
global threads
threads = []
starttasks()
if verbose:

2
Lib/test/test_locale.py
View File

@ -3,7 +3,7 @@ import locale
import sys
if sys.platform == 'darwin':
raise TestSkipped("Locale support on MacOSX is minimal and cannot be tested")
raise TestSkipped("Locale support on MacOSX is minimal and cannot be tested")
oldlocale = locale.setlocale(locale.LC_NUMERIC)
tloc = "en_US"

18
Lib/test/test_macfs.py
View File

@ -22,11 +22,11 @@ class TestMacfs(unittest.TestCase):
def test_fsspec(self):
fss = macfs.FSSpec(test_support.TESTFN)
self.assertEqual(os.path.realpath(test_support.TESTFN), fss.as_pathname())
def test_fsref(self):
fsr = macfs.FSRef(test_support.TESTFN)
self.assertEqual(os.path.realpath(test_support.TESTFN), fsr.as_pathname())
def test_coercion(self):
fss = macfs.FSSpec(test_support.TESTFN)
fsr = macfs.FSRef(test_support.TESTFN)
@ -34,7 +34,7 @@ class TestMacfs(unittest.TestCase):
fsr2 = fss.as_fsref()
self.assertEqual(fss.as_pathname(), fss2.as_pathname())
self.assertEqual(fsr.as_pathname(), fsr2.as_pathname())
def test_dates(self):
import time
fss = macfs.FSSpec(test_support.TESTFN)
@ -42,24 +42,24 @@ class TestMacfs(unittest.TestCase):
fss.SetDates(now, now-1, now-2)
dates = fss.GetDates()
self.assertEqual(dates, (now, now-1, now-2))
def test_ctor_type(self):
fss = macfs.FSSpec(test_support.TESTFN)
fss.SetCreatorType('Pyth', 'TEXT')
filecr, filetp = fss.GetCreatorType()
self.assertEqual((filecr, filetp), ('Pyth', 'TEXT'))
def test_alias(self):
fss = macfs.FSSpec(test_support.TESTFN)
alias = fss.NewAlias()
fss2, changed = alias.Resolve()
self.assertEqual(changed, 0)
self.assertEqual(fss.as_pathname(), fss2.as_pathname())
self.assertEqual(fss.as_pathname(), fss2.as_pathname())
def test_fss_alias(self):
fss = macfs.FSSpec(test_support.TESTFN)
def test_main():
test_support.run_unittest(TestMacfs)

14
Lib/test/test_macostools.py
View File

@ -29,7 +29,7 @@ class TestMacostools(unittest.TestCase):
os.unlink(TESTFN2)
except:
pass
def compareData(self):
fp = open(test_support.TESTFN, 'r')
data1 = fp.read()
@ -48,11 +48,11 @@ class TestMacostools(unittest.TestCase):
if data1 != data2:
return 'Resource forks differ'
return ''
def test_touched(self):
# This really only tests that nothing unforeseen happens.
macostools.touched(test_support.TESTFN)
def test_copy(self):
try:
os.unlink(TESTFN2)
@ -60,7 +60,7 @@ class TestMacostools(unittest.TestCase):
pass
macostools.copy(test_support.TESTFN, TESTFN2)
self.assertEqual(self.compareData(), '')
def test_mkalias(self):
try:
os.unlink(TESTFN2)
@ -69,7 +69,7 @@ class TestMacostools(unittest.TestCase):
macostools.mkalias(test_support.TESTFN, TESTFN2)
fss, _, _ = macfs.ResolveAliasFile(TESTFN2)
self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
def test_mkalias_relative(self):
try:
os.unlink(TESTFN2)
@ -78,8 +78,8 @@ class TestMacostools(unittest.TestCase):
macostools.mkalias(test_support.TESTFN, TESTFN2, sys.prefix)
fss, _, _ = macfs.ResolveAliasFile(TESTFN2)
self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
def test_main():
test_support.run_unittest(TestMacostools)

2
Lib/test/test_parser.py
View File

@ -370,7 +370,7 @@ class IllegalSyntaxTestCase(unittest.TestCase):
(266,
(282, (1, 'foo'))), (4, ''))),
(4, ''),
(0, ''))
(0, ''))
self.check_bad_tree(tree, "malformed global ast")
def test_main():

1
Lib/test/test_string.py
View File

@ -82,4 +82,3 @@ for prec in range(100):
else:
#print result
pass

20
Lib/test/test_sys.py
View File

@ -127,18 +127,18 @@ class SysModuleTest(unittest.TestCase):
# testing sys.setprofile() is done in test_profile.py
def test_setcheckinterval(self):
self.assertRaises(TypeError, sys.setcheckinterval)
sys.setcheckinterval(120)
sys.setcheckinterval(100)
self.assertRaises(TypeError, sys.setcheckinterval)
sys.setcheckinterval(120)
sys.setcheckinterval(100)
def test_recursionlimit(self):
self.assertRaises(TypeError, sys.getrecursionlimit, 42)
oldlimit = sys.getrecursionlimit()
self.assertRaises(TypeError, sys.setrecursionlimit)
self.assertRaises(ValueError, sys.setrecursionlimit, -42)
sys.setrecursionlimit(10000)
self.assertEqual(sys.getrecursionlimit(), 10000)
sys.setrecursionlimit(oldlimit)
self.assertRaises(TypeError, sys.getrecursionlimit, 42)
oldlimit = sys.getrecursionlimit()
self.assertRaises(TypeError, sys.setrecursionlimit)
self.assertRaises(ValueError, sys.setrecursionlimit, -42)
sys.setrecursionlimit(10000)
self.assertEqual(sys.getrecursionlimit(), 10000)
sys.setrecursionlimit(oldlimit)
def test_getwindowsversion(self):
if hasattr(sys, "getwindowsversion"):

1
Lib/test/test_tarfile.py
View File

@ -21,6 +21,7 @@ def path(path):
return test_support.findfile(path)
testtar = path("testtar.tar")
print testtar
tempdir = path("testtar.dir")
tempname = path("testtar.tmp")
membercount = 10

1
Lib/test/test_userlist.py
View File

@ -258,4 +258,3 @@ def test_main():
if __name__ == "__main__":
test_main()

2
Lib/test/test_xpickle.py
View File

@ -39,7 +39,7 @@ def test_main():
for test in (DumpCPickle_LoadPickle,
DumpPickle_LoadCPickle,
):
suite.addTest(unittest.makeSuite(test))
suite.addTest(unittest.makeSuite(test))
test_support.run_suite(suite)
if __name__ == "__main__":

10
Lib/test/test_zipimport.py
View File

@ -16,11 +16,11 @@ import zipimport
def make_pyc(co, mtime):
data = marshal.dumps(co)
if type(mtime) is type(0.0):
# Mac mtimes need a bit of special casing
if mtime < 0x7fffffff:
mtime = int(mtime)
else:
mtime = int(-0x100000000L + long(mtime))
# Mac mtimes need a bit of special casing
if mtime < 0x7fffffff:
mtime = int(mtime)
else:
mtime = int(-0x100000000L + long(mtime))
pyc = imp.get_magic() + struct.pack("<i", int(mtime)) + data
return pyc

3
Lib/test/test_zlib.py
View File

@ -103,7 +103,7 @@ class CompressTestCase(unittest.TestCase):
self.failUnless(last > len(data), "compress level 0 always expands")
for level in range(10):
length = len(zlib.compress(data, level))
self.failUnless(length <= last,
self.failUnless(length <= last,
'compress level %d more effective than %d!' % (
level-1, level))
last = length
@ -506,4 +506,3 @@ if False:
su = ut.TestSuite()
su.addTest(ut.makeSuite(tz.CompressTestCase))
ts.run_suite(su)

19
Lib/test/tokenize_tests.py
View File

@ -1,5 +1,5 @@
# Tests for the 'tokenize' module.
# Large bits stolen from test_grammar.py.
# Large bits stolen from test_grammar.py.
# Comments
"#"
@ -129,17 +129,17 @@ bar \\ baz
if 1:
x = 2
if 1:
x = 2
x = 2
if 1:
while 0:
if 0:
x = 2
x = 2
if 0:
x = 2
x = 2
if 0:
if 2:
while 0:
if 1:
x = 2
if 2:
while 0:
if 1:
x = 2
# Operators
@ -172,4 +172,3 @@ x = -1*1/1 + 1*1 - ---1*1
# selector
import sys, time
x = sys.modules['time'].time()

28
Lib/trace.py
View File

@ -146,7 +146,7 @@ class Ignore:
class CoverageResults:
def __init__(self, counts=None, calledfuncs=None, infile=None,
outfile=None):
outfile=None):
self.counts = counts
if self.counts is None:
self.counts = {}
@ -164,7 +164,7 @@ class CoverageResults:
if type(thingie) is types.DictType:
# backwards compatibility for old trace.py after
# Zooko touched it but before calledfuncs --Zooko
# 2001-10-24
# 2001-10-24
self.update(self.__class__(thingie))
elif type(thingie) is types.TupleType and len(thingie) == 2:
counts, calledfuncs = thingie
@ -173,7 +173,7 @@ class CoverageResults:
pass
except pickle.UnpicklingError:
# backwards compatibility for old trace.py before
# Zooko touched it --Zooko 2001-10-24
# Zooko touched it --Zooko 2001-10-24
self.update(self.__class__(marshal.load(open(self.infile))))
def update(self, other):
@ -187,7 +187,7 @@ class CoverageResults:
if key != 'calledfuncs':
# backwards compatibility for abortive attempt to
# stuff calledfuncs into self.counts, by Zooko
# --Zooko 2001-10-24
# --Zooko 2001-10-24
counts[key] = counts.get(key, 0) + other_counts[key]
for key in other_calledfuncs.keys():
@ -406,18 +406,18 @@ class Trace:
ignoredirs=(), infile=None, outfile=None):
"""
@param count true iff it should count number of times each
line is executed
line is executed
@param trace true iff it should print out each line that is
being counted
being counted
@param countfuncs true iff it should just output a list of
(filename, modulename, funcname,) for functions
that were called at least once; This overrides
`count' and `trace'
`count' and `trace'
@param ignoremods a list of the names of modules to ignore
@param ignoredirs a list of the names of directories to ignore
all of the (recursive) contents of
all of the (recursive) contents of
@param infile file from which to read stored counts to be
added into the results
added into the results
@param outfile file in which to write the results
"""
self.infile = infile
@ -516,19 +516,19 @@ class Trace:
# XXX I wish inspect offered me an optimized
# `getfilename(frame)' to use in place of the presumably
# heavier `getframeinfo()'. --Zooko 2001-10-14
filename, lineno, funcname, context, lineindex = \
inspect.getframeinfo(frame, 1)
key = filename, lineno
self.counts[key] = self.counts.get(key, 0) + 1
# XXX not convinced that this memoizing is a performance
# win -- I don't know enough about Python guts to tell.
# --Zooko 2001-10-14
bname = self.pathtobasename.get(filename)
if bname is None:
# Using setdefault faster than two separate lines?
# --Zooko 2001-10-14
bname = self.pathtobasename.setdefault(filename,
@ -553,7 +553,7 @@ class Trace:
# heavier `getframeinfo()'. --Zooko 2001-10-14
filename, lineno, funcname, context, lineindex = \
inspect.getframeinfo(frame)
# XXX not convinced that this memoizing is a performance
# win -- I don't know enough about Python guts to tell.
# --Zooko 2001-10-14