mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 21:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

test_locale now ignores the DeprecationWarning (#977)

Browse source 
Don't fail anymore if test run with python3 -Werror.

Fix also deprecation message: add a space.
This commit is contained in:
Victor Stinner 2017-04-03 18:09:55 +02:00 • committed by GitHub
parent 734125938d
commit 9acc6a03f1
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/locale.py
View file

@ -245,7 +245,7 @@ def format_string(f, val, grouping=False, monetary=False):
def format(percent, value, grouping=False, monetary=False, *additional): def format(percent, value, grouping=False, monetary=False, *additional):
"""Deprecated, use format_string instead.""" """Deprecated, use format_string instead."""
warnings.warn( warnings.warn(
"This method will be removed in a future version of Python." "This method will be removed in a future version of Python. "
"Use 'locale.format_string()' instead.", "Use 'locale.format_string()' instead.",
DeprecationWarning, stacklevel=2 DeprecationWarning, stacklevel=2
) )

24
Lib/test/test_locale.py
View file

@ -1,4 +1,4 @@
from test.support import verbose, is_android from test.support import verbose, is_android, check_warnings
import unittest import unittest
import locale import locale
import sys import sys
@ -144,8 +144,9 @@ class BaseFormattingTest(object):
func(format, value, **format_opts), out) func(format, value, **format_opts), out)
def _test_format(self, format, value, out, **format_opts): def _test_format(self, format, value, out, **format_opts):
self._test_formatfunc(format, value, out, with check_warnings(('', DeprecationWarning)):
func=locale.format, **format_opts) self._test_formatfunc(format, value, out,
func=locale.format, **format_opts)
def _test_format_string(self, format, value, out, **format_opts): def _test_format_string(self, format, value, out, **format_opts):
self._test_formatfunc(format, value, out, self._test_formatfunc(format, value, out,
@ -232,14 +233,15 @@ class TestFormatPatternArg(unittest.TestCase):
# Test handling of pattern argument of format # Test handling of pattern argument of format
def test_onlyOnePattern(self): def test_onlyOnePattern(self):
# Issue 2522: accept exactly one % pattern, and no extra chars. with check_warnings(('', DeprecationWarning)):
self.assertRaises(ValueError, locale.format, "%f\n", 'foo') # Issue 2522: accept exactly one % pattern, and no extra chars.
self.assertRaises(ValueError, locale.format, "%f\r", 'foo') self.assertRaises(ValueError, locale.format, "%f\n", 'foo')
self.assertRaises(ValueError, locale.format, "%f\r\n", 'foo') self.assertRaises(ValueError, locale.format, "%f\r", 'foo')
self.assertRaises(ValueError, locale.format, " %f", 'foo') self.assertRaises(ValueError, locale.format, "%f\r\n", 'foo')
self.assertRaises(ValueError, locale.format, "%fg", 'foo') self.assertRaises(ValueError, locale.format, " %f", 'foo')
self.assertRaises(ValueError, locale.format, "%^g", 'foo') self.assertRaises(ValueError, locale.format, "%fg", 'foo')
self.assertRaises(ValueError, locale.format, "%f%%", 'foo') self.assertRaises(ValueError, locale.format, "%^g", 'foo')
self.assertRaises(ValueError, locale.format, "%f%%", 'foo')
class TestLocaleFormatString(unittest.TestCase): class TestLocaleFormatString(unittest.TestCase):