mirror of https://github.com/python/cpython
Whitespace normalization. Leaving tokenize_tests.py alone for now.
This commit is contained in:
parent
be4cbb1668
commit
d2bf3b7ca6
|
@ -56,7 +56,7 @@ def run_method_tests(test):
|
||||||
|
|
||||||
test('count', 'aaa', 3, 'a')
|
test('count', 'aaa', 3, 'a')
|
||||||
test('count', 'aaa', 0, 'b')
|
test('count', 'aaa', 0, 'b')
|
||||||
|
|
||||||
test('find', 'abcdefghiabc', 0, 'abc')
|
test('find', 'abcdefghiabc', 0, 'abc')
|
||||||
test('find', 'abcdefghiabc', 9, 'abc', 1)
|
test('find', 'abcdefghiabc', 9, 'abc', 1)
|
||||||
test('find', 'abcdefghiabc', -1, 'def', 4)
|
test('find', 'abcdefghiabc', -1, 'def', 4)
|
||||||
|
|
|
@ -17,7 +17,7 @@ def check(a, b):
|
||||||
|
|
||||||
# test codec's full path name (see test/testcodec.py)
|
# test codec's full path name (see test/testcodec.py)
|
||||||
codecname = 'test.testcodec'
|
codecname = 'test.testcodec'
|
||||||
|
|
||||||
check(unicode('abc', codecname), u'abc')
|
check(unicode('abc', codecname), u'abc')
|
||||||
check(unicode('xdef', codecname), u'abcdef')
|
check(unicode('xdef', codecname), u'abcdef')
|
||||||
check(unicode('defx', codecname), u'defabc')
|
check(unicode('defx', codecname), u'defabc')
|
||||||
|
@ -41,4 +41,3 @@ except UnicodeError:
|
||||||
print '\\001 maps to undefined: OK'
|
print '\\001 maps to undefined: OK'
|
||||||
else:
|
else:
|
||||||
print '*** check failed: \\001 does not map to undefined'
|
print '*** check failed: \\001 does not map to undefined'
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
Roger E. Masse
|
Roger E. Masse
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from test_support import verify, verbose
|
from test_support import verify, verbose
|
||||||
import crypt
|
import crypt
|
||||||
|
|
||||||
c = crypt.crypt('mypassword', 'ab')
|
c = crypt.crypt('mypassword', 'ab')
|
||||||
|
|
|
@ -198,4 +198,3 @@ test_exc('abc %a', 1, ValueError,
|
||||||
"unsupported format character 'a' (0x61) at index 5")
|
"unsupported format character 'a' (0x61) at index 5")
|
||||||
test_exc(u'abc %\u3000', 1, ValueError,
|
test_exc(u'abc %\u3000', 1, ValueError,
|
||||||
"unsupported format character '?' (0x3000) at index 5")
|
"unsupported format character '?' (0x3000) at index 5")
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ def confirm(outcome, name):
|
||||||
fails = fails + 1
|
fails = fails + 1
|
||||||
|
|
||||||
def test_make_parser2():
|
def test_make_parser2():
|
||||||
try:
|
try:
|
||||||
# Creating parsers several times in a row should succeed.
|
# Creating parsers several times in a row should succeed.
|
||||||
# Testing this because there have been failures of this kind
|
# Testing this because there have been failures of this kind
|
||||||
# before.
|
# before.
|
||||||
|
@ -50,8 +50,8 @@ def test_make_parser2():
|
||||||
return 0
|
return 0
|
||||||
else:
|
else:
|
||||||
return p
|
return p
|
||||||
|
|
||||||
|
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# saxutils tests
|
# saxutils tests
|
||||||
|
@ -397,7 +397,7 @@ def test_expat_locator_noinfo():
|
||||||
|
|
||||||
return parser.getSystemId() is None and \
|
return parser.getSystemId() is None and \
|
||||||
parser.getPublicId() is None and \
|
parser.getPublicId() is None and \
|
||||||
parser.getLineNumber() == 1
|
parser.getLineNumber() == 1
|
||||||
|
|
||||||
def test_expat_locator_withinfo():
|
def test_expat_locator_withinfo():
|
||||||
result = StringIO()
|
result = StringIO()
|
||||||
|
|
|
@ -73,13 +73,13 @@ def findfile(file, here=__file__):
|
||||||
return file
|
return file
|
||||||
|
|
||||||
def verify(condition, reason='test failed'):
|
def verify(condition, reason='test failed'):
|
||||||
|
|
||||||
""" Verify that condition is true. If not, raise an
|
|
||||||
AssertionError.
|
|
||||||
|
|
||||||
The optinal argument reason can be given to provide
|
""" Verify that condition is true. If not, raise an
|
||||||
a better error text.
|
AssertionError.
|
||||||
|
|
||||||
"""
|
The optinal argument reason can be given to provide
|
||||||
if not condition:
|
a better error text.
|
||||||
raise AssertionError,reason
|
|
||||||
|
"""
|
||||||
|
if not condition:
|
||||||
|
raise AssertionError,reason
|
||||||
|
|
|
@ -195,7 +195,7 @@ if 0:
|
||||||
|
|
||||||
# Non surrogate above surrogate value, fixup required
|
# Non surrogate above surrogate value, fixup required
|
||||||
def test_lecmp(s, s2):
|
def test_lecmp(s, s2):
|
||||||
verify(s < s2 , "comparison failed on %s < %s" % (s, s2))
|
verify(s < s2 , "comparison failed on %s < %s" % (s, s2))
|
||||||
|
|
||||||
def test_fixup(s):
|
def test_fixup(s):
|
||||||
s2 = u'\ud800\udc01'
|
s2 = u'\ud800\udc01'
|
||||||
|
@ -372,11 +372,11 @@ verify(u'\ud800\udc02'.encode('utf-8') == \
|
||||||
verify(u'\ud84d\udc56'.encode('utf-8') == \
|
verify(u'\ud84d\udc56'.encode('utf-8') == \
|
||||||
''.join((chr(0xf0), chr(0xa3), chr(0x91), chr(0x96))) )
|
''.join((chr(0xf0), chr(0xa3), chr(0x91), chr(0x96))) )
|
||||||
# UTF-8 specific decoding tests
|
# UTF-8 specific decoding tests
|
||||||
verify(unicode(''.join((chr(0xf0), chr(0xa3), chr(0x91), chr(0x96))),
|
verify(unicode(''.join((chr(0xf0), chr(0xa3), chr(0x91), chr(0x96))),
|
||||||
'utf-8') == u'\ud84d\udc56' )
|
'utf-8') == u'\ud84d\udc56' )
|
||||||
verify(unicode(''.join((chr(0xf0), chr(0x90), chr(0x80), chr(0x82))),
|
verify(unicode(''.join((chr(0xf0), chr(0x90), chr(0x80), chr(0x82))),
|
||||||
'utf-8') == u'\ud800\udc02' )
|
'utf-8') == u'\ud800\udc02' )
|
||||||
verify(unicode(''.join((chr(0xe2), chr(0x82), chr(0xac))),
|
verify(unicode(''.join((chr(0xe2), chr(0x82), chr(0xac))),
|
||||||
'utf-8') == u'\u20ac' )
|
'utf-8') == u'\u20ac' )
|
||||||
|
|
||||||
# Other possible utf-8 test cases:
|
# Other possible utf-8 test cases:
|
||||||
|
@ -501,7 +501,7 @@ for encoding in (
|
||||||
'cp852', 'cp855', 'cp860', 'cp861', 'cp862',
|
'cp852', 'cp855', 'cp860', 'cp861', 'cp862',
|
||||||
'cp863', 'cp865', 'cp866',
|
'cp863', 'cp865', 'cp866',
|
||||||
'iso8859_10', 'iso8859_13', 'iso8859_14', 'iso8859_15',
|
'iso8859_10', 'iso8859_13', 'iso8859_14', 'iso8859_15',
|
||||||
'iso8859_2', 'iso8859_4', 'iso8859_5',
|
'iso8859_2', 'iso8859_4', 'iso8859_5',
|
||||||
'iso8859_9', 'koi8_r', 'latin_1',
|
'iso8859_9', 'koi8_r', 'latin_1',
|
||||||
'mac_cyrillic', 'mac_latin2',
|
'mac_cyrillic', 'mac_latin2',
|
||||||
|
|
||||||
|
@ -509,7 +509,7 @@ for encoding in (
|
||||||
#'cp1250', 'cp1251', 'cp1252', 'cp1253', 'cp1254', 'cp1255',
|
#'cp1250', 'cp1251', 'cp1252', 'cp1253', 'cp1254', 'cp1255',
|
||||||
#'cp1256', 'cp1257', 'cp1258',
|
#'cp1256', 'cp1257', 'cp1258',
|
||||||
#'cp424', 'cp856', 'cp857', 'cp864', 'cp869', 'cp874',
|
#'cp424', 'cp856', 'cp857', 'cp864', 'cp869', 'cp874',
|
||||||
#'iso8859_3', 'iso8859_6', 'iso8859_7',
|
#'iso8859_3', 'iso8859_6', 'iso8859_7',
|
||||||
#'mac_greek', 'mac_iceland','mac_roman', 'mac_turkish',
|
#'mac_greek', 'mac_iceland','mac_roman', 'mac_turkish',
|
||||||
|
|
||||||
### These fail the round-trip:
|
### These fail the round-trip:
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
from test_support import verbose
|
from test_support import verbose
|
||||||
|
|
||||||
class XReader:
|
class XReader:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.count = 5
|
self.count = 5
|
||||||
|
|
||||||
def readlines(self, sizehint = None):
|
def readlines(self, sizehint = None):
|
||||||
self.count = self.count - 1
|
self.count = self.count - 1
|
||||||
return map(lambda x: "%d\n" % x, range(self.count))
|
return map(lambda x: "%d\n" % x, range(self.count))
|
||||||
|
|
||||||
class Null: pass
|
class Null: pass
|
||||||
|
|
||||||
|
@ -16,28 +16,28 @@ import xreadlines
|
||||||
lineno = 0
|
lineno = 0
|
||||||
|
|
||||||
try:
|
try:
|
||||||
xreadlines.xreadlines(Null())[0]
|
xreadlines.xreadlines(Null())[0]
|
||||||
except AttributeError, detail:
|
except AttributeError, detail:
|
||||||
print "AttributeError (expected)"
|
print "AttributeError (expected)"
|
||||||
else:
|
else:
|
||||||
print "Did not throw attribute error"
|
print "Did not throw attribute error"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
xreadlines.xreadlines(XReader)[0]
|
xreadlines.xreadlines(XReader)[0]
|
||||||
except TypeError, detail:
|
except TypeError, detail:
|
||||||
print "TypeError (expected)"
|
print "TypeError (expected)"
|
||||||
else:
|
else:
|
||||||
print "Did not throw type error"
|
print "Did not throw type error"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
xreadlines.xreadlines(XReader())[1]
|
xreadlines.xreadlines(XReader())[1]
|
||||||
except RuntimeError, detail:
|
except RuntimeError, detail:
|
||||||
print "RuntimeError (expected):", detail
|
print "RuntimeError (expected):", detail
|
||||||
else:
|
else:
|
||||||
print "Did not throw runtime error"
|
print "Did not throw runtime error"
|
||||||
|
|
||||||
xresult = ['0\n', '1\n', '2\n', '3\n', '0\n', '1\n', '2\n', '0\n', '1\n', '0\n']
|
xresult = ['0\n', '1\n', '2\n', '3\n', '0\n', '1\n', '2\n', '0\n', '1\n', '0\n']
|
||||||
for line in xreadlines.xreadlines(XReader()):
|
for line in xreadlines.xreadlines(XReader()):
|
||||||
if line != xresult[lineno]:
|
if line != xresult[lineno]:
|
||||||
print "line %d differs" % lineno
|
print "line %d differs" % lineno
|
||||||
lineno += 1
|
lineno += 1
|
||||||
|
|
|
@ -14,14 +14,14 @@ class Codec(codecs.Codec):
|
||||||
def encode(self,input,errors='strict'):
|
def encode(self,input,errors='strict'):
|
||||||
|
|
||||||
return codecs.charmap_encode(input,errors,encoding_map)
|
return codecs.charmap_encode(input,errors,encoding_map)
|
||||||
|
|
||||||
def decode(self,input,errors='strict'):
|
def decode(self,input,errors='strict'):
|
||||||
|
|
||||||
return codecs.charmap_decode(input,errors,decoding_map)
|
return codecs.charmap_decode(input,errors,decoding_map)
|
||||||
|
|
||||||
class StreamWriter(Codec,codecs.StreamWriter):
|
class StreamWriter(Codec,codecs.StreamWriter):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
class StreamReader(Codec,codecs.StreamReader):
|
class StreamReader(Codec,codecs.StreamReader):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -46,4 +46,3 @@ decoding_map.update({
|
||||||
encoding_map = {}
|
encoding_map = {}
|
||||||
for k,v in decoding_map.items():
|
for k,v in decoding_map.items():
|
||||||
encoding_map[v] = k
|
encoding_map[v] = k
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue