mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Fix Python deprecation warning in printers.py

Browse Source 
python/libstdcxx/v6/printers.py:1355: DeprecationWarning: 'count' is passed as positional argument

The Python docs say:

  Deprecated since version 3.13: Passing count and flags as positional
  arguments is deprecated. In future Python versions they will be
  keyword-only parameters.

Using a keyword argument for count only became possible with Python 3.1
so introduce a new function to do the substitution.

libstdc++-v3/ChangeLog:

	* python/libstdcxx/v6/printers.py (strip_fundts_namespace): New.
	(StdExpAnyPrinter, StdExpOptionalPrinter): Use it.
This commit is contained in:
Jonathan Wakely 2024-10-16 09:22:37 +01:00 committed by Jonathan Wakely
parent cc217a1ecb
commit b9e98bb991
No known key found for this signature in database
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libstdc++-v3/python/libstdcxx/v6/printers.py
View File

@ -220,6 +220,16 @@ def strip_versioned_namespace(typename):
return typename.replace(_versioned_namespace, '') return typename.replace(_versioned_namespace, '')
def strip_fundts_namespace(typ):
"""Remove "fundamentals_vN" inline namespace from qualified type name."""
pattern = r'^std::experimental::fundamentals_v\d::'
repl = 'std::experimental::'
if sys.version_info[0] == 2:
return re.sub(pattern, repl, typ, 1)
else: # Technically this needs Python 3.1 but nobody should be using 3.0
return re.sub(pattern, repl, typ, count=1)
def strip_inline_namespaces(type_str): def strip_inline_namespaces(type_str):
"""Remove known inline namespaces from the canonical name of a type.""" """Remove known inline namespaces from the canonical name of a type."""
type_str = strip_versioned_namespace(type_str) type_str = strip_versioned_namespace(type_str)
@ -1355,8 +1365,7 @@ class StdExpAnyPrinter(SingleObjContainerPrinter):
def __init__(self, typename, val): def __init__(self, typename, val):
self._typename = strip_versioned_namespace(typename) self._typename = strip_versioned_namespace(typename)
self._typename = re.sub(r'^std::experimental::fundamentals_v\d::', self._typename = strip_fundts_namespace(self._typename)
'std::experimental::', self._typename, 1)
self._val = val self._val = val
self._contained_type = None self._contained_type = None
contained_value = None contained_value = None
@ -1449,10 +1458,8 @@ class StdExpOptionalPrinter(SingleObjContainerPrinter):
"""Print a std::optional or std::experimental::optional.""" """Print a std::optional or std::experimental::optional."""
def __init__(self, typename, val): def __init__(self, typename, val):
typename = strip_versioned_namespace(typename) self._typename = strip_versioned_namespace(typename)
self._typename = re.sub( self._typename = strip_fundts_namespace(self._typename)
r'^std::(experimental::|)(fundamentals_v\d::|)(.*)',
r'std::\1\3', typename, 1)
payload = val['_M_payload'] payload = val['_M_payload']
if self._typename.startswith('std::experimental'): if self._typename.startswith('std::experimental'):
engaged = val['_M_engaged'] engaged = val['_M_engaged']