From f6fb64d8a553ca1ae41c40f7a6f1351c68da49c9 Mon Sep 17 00:00:00 2001 From: Gavin Burnell Date: Sun, 12 Apr 2020 16:17:23 +0100 Subject: [PATCH] Put extra check in for import escape from html or cgi depending on python version. Bump recipe --- Stoner/tools.py | 6 +++++- recipe/meta.yaml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Stoner/tools.py b/Stoner/tools.py index f8a759fc0..4b80b6f3f 100644 --- a/Stoner/tools.py +++ b/Stoner/tools.py @@ -32,9 +32,13 @@ import copy from numpy import log10, floor, abs, logical_and, isnan, round, ndarray, dtype # pylint: disable=redefined-builtin -from html import escape as html_escape from copy import deepcopy +try: + from html import escape as html_escape +except ImportError: + from cgi import escape as html_escape + operator = { "eq": lambda k, v: k == v, "ne": lambda k, v: k != v, diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 84a86c3f8..10feb4e81 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ package: name: '{{ name|lower }}' - version: '0.9.5' + version: '0.9.6' source: git_tag: master