[Python-checkins] CVS: python/dist/src/Lib/test test_b1.py,1.20,1.21 test_unicode.py,1.5,1.6
Guido van Rossum
python-dev@python.org
Wed, 5 Apr 2000 16:11:52 -0400 (EDT)
Update of /projects/cvsroot/python/dist/src/Lib/test
In directory eric:/home/guido/hp/mal/py-patched/Lib/test
Modified Files:
test_b1.py test_unicode.py
Log Message:
Marc-Andre's third try at this bulk patch seems to work (except that
his copy of test_contains.py seems to be broken -- the lines he
deleted were already absent). Checkin messages:
New Unicode support for int(), float(), complex() and long().
- new APIs PyInt_FromUnicode() and PyLong_FromUnicode()
- added support for Unicode to PyFloat_FromString()
- new encoding API PyUnicode_EncodeDecimal() which converts
Unicode to a decimal char* string (used in the above new
APIs)
- shortcuts for calls like int(<int object>) and float(<float obj>)
- tests for all of the above
Unicode compares and contains checks:
- comparing Unicode and non-string types now works; TypeErrors
are masked, all other errors such as ValueError during
Unicode coercion are passed through (note that PyUnicode_Compare
does not implement the masking -- PyObject_Compare does this)
- contains now works for non-string types too; TypeErrors are
masked and 0 returned; all other errors are passed through
Better testing support for the standard codecs.
Misc minor enhancements, such as an alias dbcs for the mbcs codec.
Changes:
- PyLong_FromString() now applies the same error checks as
does PyInt_FromString(): trailing garbage is reported
as error and not longer silently ignored. The only characters
which may be trailing the digits are 'L' and 'l' -- these
are still silently ignored.
- string.ato?() now directly interface to int(), long() and
float(). The error strings are now a little different, but
the type still remains the same. These functions are now
ready to get declared obsolete ;-)
- PyNumber_Int() now also does a check for embedded NULL chars
in the input string; PyNumber_Long() already did this (and
still does)
Followed by:
Looks like I've gone a step too far there... (and test_contains.py
seem to have a bug too).
I've changed back to reporting all errors in PyUnicode_Contains()
and added a few more test cases to test_contains.py (plus corrected
the join() NameError).
Index: test_b1.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_b1.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** test_b1.py 1999/03/25 21:25:01 1.20
--- test_b1.py 2000/04/05 20:11:19 1.21
***************
*** 96,99 ****
--- 96,100 ----
if complex(0.0, 3.14) <> 3.14j: raise TestFailed, 'complex(0.0, 3.14)'
if complex(" 3.14+J ") <> 3.14+1j: raise TestFailed, 'complex(" 3.14+J )"'
+ if complex(u" 3.14+J ") <> 3.14+1j: raise TestFailed, 'complex(u" 3.14+J )"'
class Z:
def __complex__(self): return 3.14j
***************
*** 209,212 ****
--- 210,216 ----
if float(314L) <> 314.0: raise TestFailed, 'float(314L)'
if float(" 3.14 ") <> 3.14: raise TestFailed, 'float(" 3.14 ")'
+ if float(u" 3.14 ") <> 3.14: raise TestFailed, 'float(u" 3.14 ")'
+ if float(u" \u0663.\u0661\u0664 ") <> 3.14:
+ raise TestFailed, 'float(u" \u0663.\u0661\u0664 ")'
print 'getattr'
***************
*** 255,258 ****
--- 259,265 ----
if int(3.5) <> 3: raise TestFailed, 'int(3.5)'
if int(-3.5) <> -3: raise TestFailed, 'int(-3.5)'
+ # Different base:
+ if int("10",16) <> 16L: raise TestFailed, 'int("10",16)'
+ if int(u"10",16) <> 16L: raise TestFailed, 'int(u"10",16)'
# Test conversion fron strings and various anomalies
L = [
***************
*** 268,274 ****
--- 275,300 ----
(' \t\t 314 \t\t ', 314),
(`sys.maxint`, sys.maxint),
+ (' 1x', ValueError),
+ (' 1 ', 1),
+ (' 1\02 ', ValueError),
('', ValueError),
(' ', ValueError),
(' \t\t ', ValueError),
+ (u'0', 0),
+ (u'1', 1),
+ (u'9', 9),
+ (u'10', 10),
+ (u'99', 99),
+ (u'100', 100),
+ (u'314', 314),
+ (u' 314', 314),
+ (u'\u0663\u0661\u0664 ', 314),
+ (u' \t\t 314 \t\t ', 314),
+ (u' 1x', ValueError),
+ (u' 1 ', 1),
+ (u' 1\02 ', ValueError),
+ (u'', ValueError),
+ (u' ', ValueError),
+ (u' \t\t ', ValueError),
]
for s, v in L:
***************
*** 350,357 ****
--- 376,390 ----
if long(3.5) <> 3L: raise TestFailed, 'long(3.5)'
if long(-3.5) <> -3L: raise TestFailed, 'long(-3.5)'
+ if long("-3") <> -3L: raise TestFailed, 'long("-3")'
+ if long(u"-3") <> -3L: raise TestFailed, 'long(u"-3")'
+ # Different base:
+ if long("10",16) <> 16L: raise TestFailed, 'long("10",16)'
+ if long(u"10",16) <> 16L: raise TestFailed, 'long(u"10",16)'
# Check conversions from string (same test set as for int(), and then some)
LL = [
('1' + '0'*20, 10L**20),
('1' + '0'*100, 10L**100),
+ (u'1' + u'0'*20, 10L**20),
+ (u'1' + u'0'*100, 10L**100),
]
for s, v in L + LL:
***************
*** 364,372 ****
try:
if long(ss) != long(vv):
! raise TestFailed, "int(%s)" % `ss`
except v:
pass
except ValueError, e:
! raise TestFailed, "int(%s) raised ValueError: %s" % (`ss`, e)
print 'map'
--- 397,405 ----
try:
if long(ss) != long(vv):
! raise TestFailed, "long(%s)" % `ss`
except v:
pass
except ValueError, e:
! raise TestFailed, "long(%s) raised ValueError: %s" % (`ss`, e)
print 'map'
Index: test_unicode.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_unicode.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** test_unicode.py 2000/03/28 20:29:57 1.5
--- test_unicode.py 2000/04/05 20:11:19 1.6
***************
*** 222,234 ****
# Contains:
print 'Testing Unicode contains method...',
! assert ('a' in 'abdb') == 1
! assert ('a' in 'bdab') == 1
! assert ('a' in 'bdaba') == 1
! assert ('a' in 'bdba') == 1
assert ('a' in u'bdba') == 1
assert (u'a' in u'bdba') == 1
assert (u'a' in u'bdb') == 0
assert (u'a' in 'bdb') == 0
assert (u'a' in 'bdba') == 1
print 'done.'
--- 222,242 ----
# Contains:
print 'Testing Unicode contains method...',
! assert ('a' in u'abdb') == 1
! assert ('a' in u'bdab') == 1
! assert ('a' in u'bdaba') == 1
assert ('a' in u'bdba') == 1
+ assert ('a' in u'bdba') == 1
assert (u'a' in u'bdba') == 1
assert (u'a' in u'bdb') == 0
assert (u'a' in 'bdb') == 0
assert (u'a' in 'bdba') == 1
+ assert (u'a' in ('a',1,None)) == 1
+ assert (u'a' in (1,None,'a')) == 1
+ assert (u'a' in (1,None,u'a')) == 1
+ assert ('a' in ('a',1,None)) == 1
+ assert ('a' in (1,None,'a')) == 1
+ assert ('a' in (1,None,u'a')) == 1
+ assert ('a' in ('x',1,u'y')) == 0
+ assert ('a' in ('x',1,None)) == 0
print 'done.'
***************
*** 271,280 ****
u = u''.join(map(unichr, range(256)))
! for encoding in ('latin-1',):
! assert unicode(u.encode(encoding),encoding) == u
u = u''.join(map(unichr, range(128)))
! for encoding in ('ascii',):
! assert unicode(u.encode(encoding),encoding) == u
print 'done.'
--- 279,365 ----
u = u''.join(map(unichr, range(256)))
! for encoding in (
! 'latin-1',
! ):
! try:
! assert unicode(u.encode(encoding),encoding) == u
! except AssertionError:
! print '*** codec "%s" failed round-trip' % encoding
! except ValueError,why:
! print '*** codec for "%s" failed: %s' % (encoding, why)
u = u''.join(map(unichr, range(128)))
! for encoding in (
! 'ascii',
! ):
! try:
! assert unicode(u.encode(encoding),encoding) == u
! except AssertionError:
! print '*** codec "%s" failed round-trip' % encoding
! except ValueError,why:
! print '*** codec for "%s" failed: %s' % (encoding, why)
!
! print 'done.'
!
! print 'Testing standard mapping codecs...',
!
! print '0-127...',
! s = ''.join(map(chr, range(128)))
! for encoding in (
! 'cp037', 'cp1026',
! 'cp437', 'cp500', 'cp737', 'cp775', 'cp850',
! 'cp852', 'cp855', 'cp860', 'cp861', 'cp862',
! 'cp863', 'cp865', 'cp866',
! 'iso8859_10', 'iso8859_13', 'iso8859_14', 'iso8859_15',
! 'iso8859_2', 'iso8859_3', 'iso8859_4', 'iso8859_5', 'iso8859_6',
! 'iso8859_7', 'iso8859_9', 'koi8_r', 'latin_1',
! 'mac_cyrillic', 'mac_latin2',
!
! 'cp1250', 'cp1251', 'cp1252', 'cp1253', 'cp1254', 'cp1255',
! 'cp1256', 'cp1257', 'cp1258',
! 'cp856', 'cp857', 'cp864', 'cp869', 'cp874',
!
! 'mac_greek', 'mac_iceland','mac_roman', 'mac_turkish',
! 'cp1006', 'cp875', 'iso8859_8',
!
! ### These have undefined mappings:
! #'cp424',
!
! ):
! try:
! assert unicode(s,encoding).encode(encoding) == s
! except AssertionError:
! print '*** codec "%s" failed round-trip' % encoding
! except ValueError,why:
! print '*** codec for "%s" failed: %s' % (encoding, why)
!
! print '128-255...',
! s = ''.join(map(chr, range(128,256)))
! for encoding in (
! 'cp037', 'cp1026',
! 'cp437', 'cp500', 'cp737', 'cp775', 'cp850',
! 'cp852', 'cp855', 'cp860', 'cp861', 'cp862',
! 'cp863', 'cp865', 'cp866',
! 'iso8859_10', 'iso8859_13', 'iso8859_14', 'iso8859_15',
! 'iso8859_2', 'iso8859_3', 'iso8859_4', 'iso8859_5', 'iso8859_6',
! 'iso8859_7', 'iso8859_9', 'koi8_r', 'latin_1',
! 'mac_cyrillic', 'mac_latin2',
!
! ### These have undefined mappings:
! #'cp1250', 'cp1251', 'cp1252', 'cp1253', 'cp1254', 'cp1255',
! #'cp1256', 'cp1257', 'cp1258',
! #'cp424', 'cp856', 'cp857', 'cp864', 'cp869', 'cp874',
! #'mac_greek', 'mac_iceland','mac_roman', 'mac_turkish',
!
! ### These fail the round-trip:
! #'cp1006', 'cp875', 'iso8859_8',
!
! ):
! try:
! assert unicode(s,encoding).encode(encoding) == s
! except AssertionError:
! print '*** codec "%s" failed round-trip' % encoding
! except ValueError,why:
! print '*** codec for "%s" failed: %s' % (encoding, why)
print 'done.'