[Commit-gnuradio] [gnuradio] 13/37: Merge remote-tracking branch 'gnuradio-wg-grc/grc_hide_ports'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit fe1f386291b77d562e0602ef61b64a42d863e535
Merge: 6283142 831d05e
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 11 15:50:30 2014 -0400

    Merge remote-tracking branch 'gnuradio-wg-grc/grc_hide_ports'
    
    Conflicts:
        grc/base/Port.py
        grc/gui/Block.py

 grc/base/Port.py     | 31 ++++++++++++++++---------------
 grc/gui/Block.py     | 22 +++++++++++++++-------
 grc/gui/Port.py      |  2 +-
 grc/python/block.dtd |  4 ++--
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --cc grc/base/Port.py
index edc309b,0f81dfc..34766bb
--- a/grc/base/Port.py
+++ b/grc/base/Port.py
@@@ -97,20 -100,18 +100,18 @@@ class Port(Element)
  
      def get_associated_ports(self):
          if not self.get_type() == 'bus':
-             return [self];
+             return [self]
          else:
              if self.is_source():
-                 get_p = self.get_parent().get_sources;
-                 bus_structure = 
self.get_parent().current_bus_structure['source'];
-                 direc = 'source'
+                 get_ports = self.get_parent().get_sources
+                 bus_structure = 
self.get_parent().current_bus_structure['source']
              else:
-                 get_p = self.get_parent().get_sinks;
-                 bus_structure = 
self.get_parent().current_bus_structure['sink'];
-                 direc = 'sink'
+                 get_ports = self.get_parent().get_sinks
+                 bus_structure = 
self.get_parent().current_bus_structure['sink']
 -            
 +
-             ports = [i for i in get_p() if not i.get_type() == 'bus'];
+             ports = [i for i in get_ports() if not i.get_type() == 'bus']
              if bus_structure:
-                 busses = [i for i in get_p() if i.get_type() == 'bus'];
-                 bus_index = busses.index(self);
-                 ports = filter(lambda a: ports.index(a) in 
bus_structure[bus_index], ports);
-             return ports;
+                 busses = [i for i in get_ports() if i.get_type() == 'bus']
+                 bus_index = busses.index(self)
+                 ports = filter(lambda a: ports.index(a) in 
bus_structure[bus_index], ports)
+             return ports