diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /dev-python/pyxdg/files | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'dev-python/pyxdg/files')
-rw-r--r-- | dev-python/pyxdg/files/pyxdg-0.26-python384.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/dev-python/pyxdg/files/pyxdg-0.26-python384.patch b/dev-python/pyxdg/files/pyxdg-0.26-python384.patch deleted file mode 100644 index def4a835f036..000000000000 --- a/dev-python/pyxdg/files/pyxdg-0.26-python384.patch +++ /dev/null @@ -1,58 +0,0 @@ -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( |