From 8fe7f0fe5fe89f6ec32732dd802608060e973f0d Mon Sep 17 00:00:00 2001
From: Eric Blossom <eb@comsec.com>
Date: Sun, 31 Oct 2010 20:03:35 -0700
Subject: Cleanup gr:connect and gr:disconnect for Guile.
Rename {dis,}connect to {dis,}primitive_connect in .i file.
Update python code to reflect change.
---
gnuradio-core/src/python/gnuradio/gr/hier_block2.py | 14 +++++++-------
gnuradio-core/src/python/gnuradio/gr/top_block.py | 16 ++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'gnuradio-core/src/python')
diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
index 370f8a9d90..debb65d912 100644
--- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
+++ b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
@@ -66,7 +66,7 @@ class hier_block2(object):
raise ValueError, ("connect requires at least one endpoint; %d provided." % (len (points),))
else:
if len(points) == 1:
- self._hb.connect(points[0].to_basic_block())
+ self._hb.primitive_connect(points[0].to_basic_block())
else:
for i in range (1, len (points)):
self._connect(points[i-1], points[i])
@@ -74,8 +74,8 @@ class hier_block2(object):
def _connect(self, src, dst):
(src_block, src_port) = self._coerce_endpoint(src)
(dst_block, dst_port) = self._coerce_endpoint(dst)
- self._hb.connect(src_block.to_basic_block(), src_port,
- dst_block.to_basic_block(), dst_port)
+ self._hb.primitive_connect(src_block.to_basic_block(), src_port,
+ dst_block.to_basic_block(), dst_port)
def _coerce_endpoint(self, endp):
if hasattr(endp, 'to_basic_block'):
@@ -97,10 +97,10 @@ class hier_block2(object):
"""
if len (points) < 1:
- raise ValueError, ("disconnect requires at least two endpoints; %d provided." % (len (points),))
+ raise ValueError, ("disconnect requires at least one endpoint; %d provided." % (len (points),))
else:
if len (points) == 1:
- self._hb.disconnect(points[0].to_basic_block())
+ self._hb.primitive_disconnect(points[0].to_basic_block())
else:
for i in range (1, len (points)):
self._disconnect(points[i-1], points[i])
@@ -108,6 +108,6 @@ class hier_block2(object):
def _disconnect(self, src, dst):
(src_block, src_port) = self._coerce_endpoint(src)
(dst_block, dst_port) = self._coerce_endpoint(dst)
- self._hb.disconnect(src_block.to_basic_block(), src_port,
- dst_block.to_basic_block(), dst_port)
+ self._hb.primitive_disconnect(src_block.to_basic_block(), src_port,
+ dst_block.to_basic_block(), dst_port)
diff --git a/gnuradio-core/src/python/gnuradio/gr/top_block.py b/gnuradio-core/src/python/gnuradio/gr/top_block.py
index 8fe5303c81..1e36d3b481 100644
--- a/gnuradio-core/src/python/gnuradio/gr/top_block.py
+++ b/gnuradio-core/src/python/gnuradio/gr/top_block.py
@@ -118,7 +118,7 @@ class top_block(object):
raise ValueError, ("connect requires at least one endpoint; %d provided." % (len (points),))
else:
if len(points) == 1:
- self._tb.connect(points[0].to_basic_block())
+ self._tb.primitive_connect(points[0].to_basic_block())
else:
for i in range (1, len (points)):
self._connect(points[i-1], points[i])
@@ -126,8 +126,8 @@ class top_block(object):
def _connect(self, src, dst):
(src_block, src_port) = self._coerce_endpoint(src)
(dst_block, dst_port) = self._coerce_endpoint(dst)
- self._tb.connect(src_block.to_basic_block(), src_port,
- dst_block.to_basic_block(), dst_port)
+ self._tb.primitive_connect(src_block.to_basic_block(), src_port,
+ dst_block.to_basic_block(), dst_port)
def _coerce_endpoint(self, endp):
if hasattr(endp, 'to_basic_block'):
@@ -139,14 +139,14 @@ class top_block(object):
raise ValueError("unable to coerce endpoint")
def disconnect(self, *points):
- '''connect requires one or more arguments that can be coerced to endpoints.
+ '''disconnect requires one or more arguments that can be coerced to endpoints.
If more than two arguments are provided, they are disconnected successively.
'''
if len (points) < 1:
- raise ValueError, ("disconnect requires at least two endpoints; %d provided." % (len (points),))
+ raise ValueError, ("disconnect requires at least one endpoint; %d provided." % (len (points),))
else:
if len(points) == 1:
- self._tb.disconnect(points[0].to_basic_block())
+ self._tb.primitive_disconnect(points[0].to_basic_block())
else:
for i in range (1, len (points)):
self._disconnect(points[i-1], points[i])
@@ -154,6 +154,6 @@ class top_block(object):
def _disconnect(self, src, dst):
(src_block, src_port) = self._coerce_endpoint(src)
(dst_block, dst_port) = self._coerce_endpoint(dst)
- self._tb.disconnect(src_block.to_basic_block(), src_port,
- dst_block.to_basic_block(), dst_port)
+ self._tb.primitive_disconnect(src_block.to_basic_block(), src_port,
+ dst_block.to_basic_block(), dst_port)
--
cgit v1.2.3