diff options
Diffstat (limited to 'dev-python/pyxdg/files/pyxdg-0.26-python384.patch')
-rw-r--r-- | dev-python/pyxdg/files/pyxdg-0.26-python384.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/dev-python/pyxdg/files/pyxdg-0.26-python384.patch b/dev-python/pyxdg/files/pyxdg-0.26-python384.patch new file mode 100644 index 000000000000..def4a835f036 --- /dev/null +++ b/dev-python/pyxdg/files/pyxdg-0.26-python384.patch @@ -0,0 +1,58 @@ +From 9b913229ace838958e51a16cabc41905a2460f7b Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki <conrad@kostecki.com> +Date: Tue, 25 Aug 2020 00:24:53 +0200 +Subject: [PATCH] Fix compatibility with >=python-3.8.4 + +Signed-off-by: Conrad Kostecki <conrad@kostecki.com> +--- + xdg/Menu.py | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/xdg/Menu.py b/xdg/Menu.py +index 1d03cad..ee406bd 100644 +--- a/xdg/Menu.py ++++ b/xdg/Menu.py +@@ -21,6 +21,7 @@ def print_menu(menu, tab=0): + import locale + import subprocess + import ast ++import sys + try: + import xml.etree.cElementTree as etree + except ImportError: +@@ -35,6 +36,17 @@ def print_menu(menu, tab=0): + import xdg.Config + + ++def _ast_const(name): ++ if sys.version_info >= (3, 4): ++ name = ast.literal_eval(name) ++ if sys.version_info >= (3, 8): ++ return ast.Constant(name) ++ else: ++ return ast.NameConstant(name) ++ else: ++ return ast.Name(id=name, ctx=ast.Load()) ++ ++ + def _strxfrm(s): + """Wrapper around locale.strxfrm that accepts unicode strings on Python 2. + +@@ -754,7 +766,7 @@ def parse_rule(self, node): + if expr: + tree.body = expr + else: +- tree.body = ast.Name('False', ast.Load()) ++ tree.body = _ast_const('False') + ast.fix_missing_locations(tree) + return Rule(type, tree) + +@@ -781,7 +793,7 @@ def parse_rule_node(self, node): + expr = self.parse_bool_op(node, ast.Or()) + return ast.UnaryOp(ast.Not(), expr) if expr else None + elif tag == 'All': +- return ast.Name('True', ast.Load()) ++ return _ast_const('True') + elif tag == 'Category': + category = node.text + return ast.Compare( |