Steve Kowalik
e07aacda10
* Support Python 3.14 ast changes. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ruamel.yaml.convert?expand=0&rev=7
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
Index: ruamel.yaml.convert-0.3.2/setup.py
|
|
===================================================================
|
|
--- ruamel.yaml.convert-0.3.2.orig/setup.py
|
|
+++ ruamel.yaml.convert-0.3.2/setup.py
|
|
@@ -49,8 +49,7 @@ if sys.version_info < (3, 4):
|
|
|
|
|
|
if sys.version_info >= (3, 8):
|
|
-
|
|
- from ast import Str, Num, Bytes, NameConstant # NOQA
|
|
+ from ast import Constant # NOQA
|
|
|
|
|
|
if sys.version_info < (3,):
|
|
@@ -100,15 +99,7 @@ def literal_eval(node_or_string):
|
|
raise TypeError('only string or AST nodes supported')
|
|
|
|
def _convert(node):
|
|
- if isinstance(node, Str):
|
|
- if sys.version_info < (3,) and not isinstance(node.s, unicode):
|
|
- return node.s.decode('utf-8')
|
|
- return node.s
|
|
- elif isinstance(node, Bytes):
|
|
- return node.s
|
|
- elif isinstance(node, Num):
|
|
- return node.n
|
|
- elif isinstance(node, Tuple):
|
|
+ if isinstance(node, Tuple):
|
|
return tuple(map(_convert, node.elts))
|
|
elif isinstance(node, List):
|
|
return list(map(_convert, node.elts))
|
|
@@ -116,7 +107,7 @@ def literal_eval(node_or_string):
|
|
return set(map(_convert, node.elts))
|
|
elif isinstance(node, Dict):
|
|
return dict((_convert(k), _convert(v)) for k, v in zip(node.keys, node.values))
|
|
- elif isinstance(node, NameConstant):
|
|
+ elif isinstance(node, Constant):
|
|
return node.value
|
|
elif sys.version_info < (3, 4) and isinstance(node, Name):
|
|
if node.id in _safe_names:
|