diff options
| -rw-r--r-- | grc/core/blocks/block.py | 5 | ||||
| -rw-r--r-- | grc/core/generator/top_block.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/grc/core/blocks/block.py b/grc/core/blocks/block.py index e0858957ab..0d8a779486 100644 --- a/grc/core/blocks/block.py +++ b/grc/core/blocks/block.py @@ -127,11 +127,10 @@ class Block(Element): port_factory = self.parent_platform.make_port port_ids = set() - def make_stream_port_id(_pool=itertools.count()): - return {'sink': 'in', 'source': 'out'}[direction] + str(next(_pool)) + stream_port_ids = itertools.count() for i, port_data in enumerate(ports_n): - port_id = port_data.setdefault('id', make_stream_port_id()) + port_id = port_data.setdefault('id', str(next(stream_port_ids))) if port_id in port_ids: raise Exception('Port id "{}" already exists in {}s'.format(port_id, direction)) port_ids.add(port_id) diff --git a/grc/core/generator/top_block.py b/grc/core/generator/top_block.py index d6a7e35575..1105b81963 100644 --- a/grc/core/generator/top_block.py +++ b/grc/core/generator/top_block.py @@ -228,7 +228,7 @@ class TopBlockGenerator(object): key = port.key if not key.isdigit(): - key = re.findall(r'\d+', key)[0] + key.repr(key) return '({block}, {key})'.format(block=block, key=key) |