diff options
| author | Clayton Smith <argilo@gmail.com> | 2020-10-03 12:34:28 -0400 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-10-05 09:36:11 +0200 |
| commit | b360284d9b40799f1920929453e2db6e6384ae4e (patch) | |
| tree | d0b6a4a9195c2cf62fd4a13c69deb52b6b14c631 /grc/core/utils/descriptors/evaluated.py | |
| parent | 5f618c67a9f8790337ca6b8b80575d02385e8ae9 (diff) | |
grc: remove six
Diffstat (limited to 'grc/core/utils/descriptors/evaluated.py')
| -rw-r--r-- | grc/core/utils/descriptors/evaluated.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/grc/core/utils/descriptors/evaluated.py b/grc/core/utils/descriptors/evaluated.py index 19fa46bbad..a9735fb861 100644 --- a/grc/core/utils/descriptors/evaluated.py +++ b/grc/core/utils/descriptors/evaluated.py @@ -2,10 +2,7 @@ # This file is part of GNU Radio # # SPDX-License-Identifier: GPL-2.0-or-later -# - - -import six +# class Evaluated(object): @@ -54,7 +51,7 @@ class Evaluated(object): def __set__(self, instance, value): attribs = instance.__dict__ value = value or self.default - if isinstance(value, six.string_types) and value.startswith('${') and value.endswith('}'): + if isinstance(value, str) and value.startswith('${') and value.endswith('}'): attribs[self.name_raw] = value[2:-1].strip() attribs.pop(self.name, None) # reset previous eval result else: @@ -68,7 +65,7 @@ class Evaluated(object): class EvaluatedEnum(Evaluated): def __init__(self, allowed_values, default=None, name=None): - if isinstance(allowed_values, six.string_types): + if isinstance(allowed_values, str): allowed_values = set(allowed_values.split()) self.allowed_values = allowed_values default = default if default is not None else next(iter(self.allowed_values)) |