diff options
| author | Ethan Furman <ethan@stoneleaf.us> | 2014-03-21 13:38:46 (GMT) |
|---|---|---|
| committer | Ethan Furman <ethan@stoneleaf.us> | 2014-03-21 13:38:46 (GMT) |
| commit | 9ab748013b00d6873b07c15ce50927104f5ece63 (patch) | |
| tree | 5d4fbd8b80ce56ce7f1ca41b4f09a8faa843f1f6 /Lib | |
| parent | a17d6780980f5c1ca940b5260edcec4cf103469c (diff) | |
| download | cpython-9ab748013b00d6873b07c15ce50927104f5ece63.zip cpython-9ab748013b00d6873b07c15ce50927104f5ece63.tar.gz cpython-9ab748013b00d6873b07c15ce50927104f5ece63.tar.bz2 | |
Issue19995: more informative error message; spelling corrections; use operator.mod instead of __mod__
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_unicode.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index b138381..003c251 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -8,6 +8,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com). import _string import codecs import itertools +import operator import struct import sys import unittest @@ -1127,20 +1128,20 @@ class UnicodeTest(string_tests.CommonTest, self.assertEqual('%.2s' % "a\xe9\u20ac", 'a\xe9') #issue 19995 - class PsuedoInt: + class PseudoInt: def __init__(self, value): self.value = int(value) def __int__(self): return self.value def __index__(self): return self.value - class PsuedoFloat: + class PseudoFloat: def __init__(self, value): self.value = float(value) def __int__(self): return int(self.value) - pi = PsuedoFloat(3.1415) - letter_m = PsuedoInt(109) + pi = PseudoFloat(3.1415) + letter_m = PseudoInt(109) self.assertEqual('%x' % 42, '2a') self.assertEqual('%X' % 15, 'F') self.assertEqual('%o' % 9, '11') @@ -1149,11 +1150,11 @@ class UnicodeTest(string_tests.CommonTest, self.assertEqual('%X' % letter_m, '6D') self.assertEqual('%o' % letter_m, '155') self.assertEqual('%c' % letter_m, 'm') - self.assertRaises(TypeError, '%x'.__mod__, pi), - self.assertRaises(TypeError, '%x'.__mod__, 3.14), - self.assertRaises(TypeError, '%X'.__mod__, 2.11), - self.assertRaises(TypeError, '%o'.__mod__, 1.79), - self.assertRaises(TypeError, '%c'.__mod__, pi), + self.assertRaisesRegex(TypeError, '%x format: an integer is required, not float', operator.mod, '%x', 3.14), + self.assertRaisesRegex(TypeError, '%X format: an integer is required, not float', operator.mod, '%X', 2.11), + self.assertRaisesRegex(TypeError, '%o format: an integer is required, not float', operator.mod, '%o', 1.79), + self.assertRaisesRegex(TypeError, '%x format: an integer is required, not PseudoFloat', operator.mod, '%x', pi), + self.assertRaises(TypeError, operator.mod, '%c', pi), def test_formatting_with_enum(self): # issue18780 |