Commit 2d268ef6 authored by Simon Feltman's avatar Simon Feltman

Quote argument names in initializer deprecation warning

Add quotation marks around names of deprecated positional arguments.
This makes the message clearer in stating what has been deprecated
in cases when only a single argument is displayed.
parent a070e712
......@@ -134,7 +134,7 @@ def deprecated_init(super_init_func, arg_names, ignore=tuple(),
# Print warnings for calls with positional arguments.
if args:
warnings.warn('Using positional arguments with the GObject constructor has been deprecated. '
'Please specify keywords for %s or use a class specific constructor. '
'Please specify keyword(s) for "%s" or use a class specific constructor. '
'See: https://wiki.gnome.org/PyGObject/InitializerDeprecations' %
', '.join(arg_names[:len(args)]),
category, stacklevel=stacklevel)
......
......@@ -3037,7 +3037,7 @@ class TestDeprecation(unittest.TestCase):
self.assertEqual(len(warn), 1)
self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
self.assertRegexpMatches(str(warn[0].message),
'.*keywords.*a, b, c.*')
'.*keyword.*a, b, c.*')
def test_deprecated_init_no_keywords_out_of_order(self):
def init(self, **kwargs):
......@@ -3050,7 +3050,7 @@ class TestDeprecation(unittest.TestCase):
self.assertEqual(len(warn), 1)
self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
self.assertRegexpMatches(str(warn[0].message),
'.*keywords.*b, a, c.*')
'.*keyword.*b, a, c.*')
def test_deprecated_init_ignored_keyword(self):
def init(self, **kwargs):
......@@ -3065,7 +3065,7 @@ class TestDeprecation(unittest.TestCase):
self.assertEqual(len(warn), 1)
self.assertTrue(issubclass(warn[0].category, PyGIDeprecationWarning))
self.assertRegexpMatches(str(warn[0].message),
'.*keywords.*a, b, c.*')
'.*keyword.*a, b, c.*')
def test_deprecated_init_with_aliases(self):
def init(self, **kwargs):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment