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/schema_checker | |
| parent | 5f618c67a9f8790337ca6b8b80575d02385e8ae9 (diff) | |
grc: remove six
Diffstat (limited to 'grc/core/schema_checker')
| -rw-r--r-- | grc/core/schema_checker/block.py | 64 | ||||
| -rw-r--r-- | grc/core/schema_checker/domain.py | 14 | ||||
| -rw-r--r-- | grc/core/schema_checker/flow_graph.py | 10 | ||||
| -rw-r--r-- | grc/core/schema_checker/utils.py | 5 | ||||
| -rw-r--r-- | grc/core/schema_checker/validator.py | 8 |
5 files changed, 47 insertions, 54 deletions
diff --git a/grc/core/schema_checker/block.py b/grc/core/schema_checker/block.py index e36865fed0..eee1e29ea9 100644 --- a/grc/core/schema_checker/block.py +++ b/grc/core/schema_checker/block.py @@ -1,69 +1,69 @@ -from .utils import Spec, expand, str_ +from .utils import Spec, expand PARAM_SCHEME = expand( - base_key=str_, # todo: rename/remove + base_key=str, # todo: rename/remove - id=str_, - label=str_, - category=str_, + id=str, + label=str, + category=str, - dtype=str_, + dtype=str, default=object, options=list, option_labels=list, - option_attributes=Spec(types=dict, required=False, item_scheme=(str_, list)), + option_attributes=Spec(types=dict, required=False, item_scheme=(str, list)), - hide=str_, + hide=str, ) PORT_SCHEME = expand( - label=str_, - domain=str_, + label=str, + domain=str, - id=str_, - dtype=str_, - vlen=(int, str_), + id=str, + dtype=str, + vlen=(int, str), - multiplicity=(int, str_), - optional=(bool, int, str_), - hide=(bool, str_), + multiplicity=(int, str), + optional=(bool, int, str), + hide=(bool, str), ) TEMPLATES_SCHEME = expand( - imports=str_, - var_make=str_, - var_value=str_, - make=str_, + imports=str, + var_make=str, + var_value=str, + make=str, callbacks=list, ) CPP_TEMPLATES_SCHEME = expand( includes=list, - declarations=str_, - make=str_, - var_make=str_, + declarations=str, + make=str, + var_make=str, callbacks=list, link=list, translations=dict, ) BLOCK_SCHEME = expand( - id=Spec(types=str_, required=True, item_scheme=None), - label=str_, - category=str_, - flags=(list, str_), + id=Spec(types=str, required=True, item_scheme=None), + label=str, + category=str, + flags=(list, str), parameters=Spec(types=list, required=False, item_scheme=PARAM_SCHEME), inputs=Spec(types=list, required=False, item_scheme=PORT_SCHEME), outputs=Spec(types=list, required=False, item_scheme=PORT_SCHEME), - asserts=(list, str_), - value=str_, + asserts=(list, str), + value=str, templates=Spec(types=dict, required=False, item_scheme=TEMPLATES_SCHEME), cpp_templates=Spec(types=dict, required=False, item_scheme=CPP_TEMPLATES_SCHEME), - documentation=str_, - grc_source=str_, + documentation=str, + grc_source=str, file_format=Spec(types=int, required=True, item_scheme=None), - block_wrapper_path=str_, # todo: rename/remove + block_wrapper_path=str, # todo: rename/remove ) diff --git a/grc/core/schema_checker/domain.py b/grc/core/schema_checker/domain.py index 19b0a510d0..34bb007a59 100644 --- a/grc/core/schema_checker/domain.py +++ b/grc/core/schema_checker/domain.py @@ -1,17 +1,17 @@ -from .utils import Spec, expand, str_ +from .utils import Spec, expand DOMAIN_CONNECTION = expand( type=Spec(types=list, required=True, item_scheme=None), - connect=str_, - cpp_connect=str_, + connect=str, + cpp_connect=str, ) DOMAIN_SCHEME = expand( - id=Spec(types=str_, required=True, item_scheme=None), - label=str_, - color=str_, + id=Spec(types=str, required=True, item_scheme=None), + label=str, + color=str, multiple_connections_per_input=bool, multiple_connections_per_output=bool, templates=Spec(types=list, required=False, item_scheme=DOMAIN_CONNECTION) -)
\ No newline at end of file +) diff --git a/grc/core/schema_checker/flow_graph.py b/grc/core/schema_checker/flow_graph.py index 746fbf4aa7..b31f03cbcf 100644 --- a/grc/core/schema_checker/flow_graph.py +++ b/grc/core/schema_checker/flow_graph.py @@ -1,13 +1,13 @@ -from .utils import Spec, expand, str_ +from .utils import Spec, expand OPTIONS_SCHEME = expand( - parameters=Spec(types=dict, required=False, item_scheme=(str_, str_)), - states=Spec(types=dict, required=False, item_scheme=(str_, str_)), + parameters=Spec(types=dict, required=False, item_scheme=(str, str)), + states=Spec(types=dict, required=False, item_scheme=(str, str)), ) BLOCK_SCHEME = expand( - name=str_, - id=str_, + name=str, + id=str, **OPTIONS_SCHEME ) diff --git a/grc/core/schema_checker/utils.py b/grc/core/schema_checker/utils.py index a9cf4c0175..2fe0bb089f 100644 --- a/grc/core/schema_checker/utils.py +++ b/grc/core/schema_checker/utils.py @@ -1,7 +1,5 @@ import collections -import six - Spec = collections.namedtuple('Spec', 'types required item_scheme') @@ -17,9 +15,6 @@ def expand(**kwargs): return {key: expand_spec(value) for key, value in kwargs.items()} -str_ = six.string_types - - class Message(collections.namedtuple('Message', 'path type message')): fmt = '{path}: {type}: {message}' diff --git a/grc/core/schema_checker/validator.py b/grc/core/schema_checker/validator.py index 903cb88b19..e1843b6e45 100644 --- a/grc/core/schema_checker/validator.py +++ b/grc/core/schema_checker/validator.py @@ -2,10 +2,8 @@ # This file is part of GNU Radio # # SPDX-License-Identifier: GPL-2.0-or-later -# - +# -import six from .utils import Message, Spec @@ -42,7 +40,7 @@ class Validator(object): self._check_var_key_dict(data, *scheme) def _check_var_key_dict(self, data, key_type, value_scheme): - for key, value in six.iteritems(data): + for key, value in data.items(): if not isinstance(key, key_type): self._error('Key type {!r} for {!r} not in valid types'.format( type(value).__name__, key)) @@ -53,7 +51,7 @@ class Validator(object): type(value).__name__, key)) def _check_dict(self, data, scheme): - for key, (types_, required, item_scheme) in six.iteritems(scheme): + for key, (types_, required, item_scheme) in scheme.items(): try: value = data[key] except KeyError: |