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/platform.py | |
| parent | 5f618c67a9f8790337ca6b8b80575d02385e8ae9 (diff) | |
grc: remove six
Diffstat (limited to 'grc/core/platform.py')
| -rw-r--r-- | grc/core/platform.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/grc/core/platform.py b/grc/core/platform.py index cbc8a138b0..7426c178f6 100644 --- a/grc/core/platform.py +++ b/grc/core/platform.py @@ -2,7 +2,7 @@ # This file is part of GNU Radio # # SPDX-License-Identifier: GPL-2.0-or-later -# +# from codecs import open @@ -12,9 +12,6 @@ import logging from itertools import chain import re -import six -from six.moves import range - from . import ( Messages, Constants, blocks, params, ports, errors, utils, schema_checker @@ -170,7 +167,7 @@ class Platform(Element): Messages.flowgraph_error_file = file_path continue - for key, block in six.iteritems(self.blocks): + for key, block in self.blocks.items(): category = self._block_categories.get(key, block.category) if not category: continue @@ -199,7 +196,7 @@ class Platform(Element): def _save_docstring_extraction_result(self, block_id, docstrings): docs = {} - for match, docstring in six.iteritems(docstrings): + for match, docstring in docstrings.items(): if not docstring or match.endswith('_sptr'): continue docs[match] = docstring.replace('\n\n', '\n').strip() @@ -280,22 +277,22 @@ class Platform(Element): path = [] def load_category(name, elements): - if not isinstance(name, six.string_types): + if not isinstance(name, str): log.debug('Invalid name %r', name) return path.append(name) for element in utils.to_list(elements): - if isinstance(element, six.string_types): + if isinstance(element, str): block_id = element self._block_categories[block_id] = list(path) elif isinstance(element, dict): - load_category(*next(six.iteritems(element))) + load_category(*next(iter(element.items()))) else: log.debug('Ignoring some elements of %s', name) path.pop() try: - module_name, categories = next(six.iteritems(data)) + module_name, categories = next(iter(data.items())) except (AttributeError, StopIteration): log.warning('no valid data found') else: |