Whitespace normalization.

This commit is contained in:
Tim Peters 2002-12-24 18:31:27 +00:00
parent 75bfd0585b
commit 6578dc925f
7 changed files with 10 additions and 11 deletions

View File

@ -31,7 +31,7 @@ def _floordiv(i, j):
def _isstring(obj):
return isinstance(obj, StringType) or isinstance(obj, UnicodeType)
return isinstance(obj, StringType) or isinstance(obj, UnicodeType)

View File

@ -46,7 +46,7 @@ def normalize_encoding(encoding):
characters except the dot used for Python package names are
collapsed and replaced with a single underscore, e.g. ' -;#'
becomes '_'.
"""
return '_'.join(_norm_encoding_RE.split(encoding))

View File

@ -2258,7 +2258,7 @@ def test_tzinfo_isoformat(self):
cls = self.theclass
datestr = '0001-02-03'
for ofs in None, zero, plus, minus, unknown:
for us in 0, 987001:
for us in 0, 987001:
d = cls(1, 2, 3, 4, 5, 59, us, tzinfo=ofs)
timestr = '04:05:59' + (us and '.987001' or '')
ofsstr = ofs is not None and d.tzname() or ''

View File

@ -3447,7 +3447,7 @@ def __getattribute__(self, attr):
if attr == 'a':
return 2
else:
return super(C2, self).__getattribute__(attr)
return super(C2, self).__getattribute__(attr)
def meth(self):
return 1
class D(C):
@ -3576,7 +3576,7 @@ class G(D):
# Immediate subclasses have their mro's adjusted in alphabetical
# order, so E's will get adjusted before adjusting F's fails. We
# check here that E's gets restored.
E_mro_before = E.__mro__
D_mro_before = D.__mro__
@ -3610,20 +3610,20 @@ class E(C, D):
pass
else:
raise TestFailed, "didn't catch MRO conflict"
def mutable_names():
class C(object):
pass
# C.__module__ could be 'test_descr' or '__main__'
mod = C.__module__
C.__name__ = 'D'
vereq((C.__module__, C.__name__), (mod, 'D'))
C.__name__ = 'D.E'
vereq((C.__module__, C.__name__), (mod, 'D.E'))
def test_main():
do_this_first()

View File

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

View File

@ -15,7 +15,7 @@ def tester(fn, wantResult):
print " returned: " + str(gotResult)
print ""
errors = errors + 1
tester('ntpath.splitext("foo.ext")', ('foo', '.ext'))
tester('ntpath.splitext("/foo/foo.ext")', ('/foo/foo', '.ext'))
tester('ntpath.splitext(".ext")', ('', '.ext'))

View File

@ -7,7 +7,7 @@
class TestCase(unittest.TestCase):
fn = "shelftemp.db"
def test_ascii_file_shelf(self):
try:
s = shelve.open(self.fn, binary=False)