diff options
| author | Sebastian Koslowski <sebastian.koslowski@gmail.com> | 2017-10-26 20:15:22 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <sebastian.koslowski@gmail.com> | 2017-11-08 19:30:41 +0100 |
| commit | 1fa89b3704d7f476e4395eb9358d5a6d7642251b (patch) | |
| tree | bb553275eff3b791a5ac4482ed0e8355d5fce0b1 /grc/core/utils/descriptors/evaluated.py | |
| parent | 865e2586b4f34fce101d8aa4a240431273009b8c (diff) | |
grc: disable auto-conversion and implement json cache
Diffstat (limited to 'grc/core/utils/descriptors/evaluated.py')
| -rw-r--r-- | grc/core/utils/descriptors/evaluated.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/grc/core/utils/descriptors/evaluated.py b/grc/core/utils/descriptors/evaluated.py index 313cee5b96..e8bce6e6ed 100644 --- a/grc/core/utils/descriptors/evaluated.py +++ b/grc/core/utils/descriptors/evaluated.py @@ -15,6 +15,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +from __future__ import absolute_import + +import six + class Evaluated(object): def __init__(self, expected_type, default, name=None): @@ -62,7 +66,7 @@ class Evaluated(object): def __set__(self, instance, value): attribs = instance.__dict__ value = value or self.default - if isinstance(value, str) and value.startswith('${') and value.endswith('}'): + if isinstance(value, six.text_type) and value.startswith('${') and value.endswith('}'): attribs[self.name_raw] = value[2:-1].strip() else: attribs[self.name] = type(self.default)(value) |