summaryrefslogtreecommitdiffstats
path: root/Lib/test/test__locale.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-21 13:34:58 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-21 13:34:58 (GMT)
commit2623a37852153363335956afab010cb0beb7e74e (patch)
treee443a19bb7a87adc2158ef2e32da5c2f3b21936c /Lib/test/test__locale.py
parent40a92f5c65767d80ebc3b3be2c2ccfc5db3afb7b (diff)
downloadcpython-2623a37852153363335956afab010cb0beb7e74e.zip
cpython-2623a37852153363335956afab010cb0beb7e74e.tar.gz
cpython-2623a37852153363335956afab010cb0beb7e74e.tar.bz2
Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line #9424: Replace deprecated assert* methods in the Python test suite. ........
Diffstat (limited to 'Lib/test/test__locale.py')
-rw-r--r--Lib/test/test__locale.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py
index 2fc128f..afcb926 100644
--- a/Lib/test/test__locale.py
+++ b/Lib/test/test__locale.py
@@ -59,7 +59,7 @@ class _LocaleTests(unittest.TestCase):
known_value = known_numerics.get(used_locale,
('', ''))[data_type == 'thousands_sep']
if known_value and calc_value:
- self.assertEquals(calc_value, known_value,
+ self.assertEqual(calc_value, known_value,
self.lc_numeric_err_msg % (
calc_value, known_value,
calc_type, data_type, set_locale,
@@ -103,7 +103,7 @@ class _LocaleTests(unittest.TestCase):
set_locale = setlocale(LC_NUMERIC)
except Error:
set_locale = "<not able to determine>"
- self.assertEquals(nl_radixchar, li_radixchar,
+ self.assertEqual(nl_radixchar, li_radixchar,
"%s (nl_langinfo) != %s (localeconv) "
"(set to %s, using %s)" % (
nl_radixchar, li_radixchar,
@@ -122,9 +122,9 @@ class _LocaleTests(unittest.TestCase):
if loc == 'eu_ES' and localeconv()['decimal_point'] == "' ":
continue
- self.assertEquals(int(eval('3.14') * 100), 314,
+ self.assertEqual(int(eval('3.14') * 100), 314,
"using eval('3.14') failed for %s" % loc)
- self.assertEquals(int(float('3.14') * 100), 314,
+ self.assertEqual(int(float('3.14') * 100), 314,
"using float('3.14') failed for %s" % loc)
if localeconv()['decimal_point'] != '.':
self.assertRaises(ValueError, float,