Removing trailing/extra whitespaces before release.

We should be more careful about letting these into the code in the future. In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
author: Tom Rondeau <tom@trondeau.com> 2014-07-07 12:18:00 -0400
committer: Tom Rondeau <tom@trondeau.com> 2014-07-07 12:18:00 -0400
commit: 597b93798a804cde1783d6d2ab53b348d57c44cd (patch)
tree: b65e73bb0de634ff5d209b15971ebdabf369a45c /gnuradio-runtime/python
parent: 1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff)
9 files changed, 58 insertions, 58 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
index d1b27e50a7..80806341ea 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2012 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GNU Radio
-# 
+#
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
-# 
+#
 # GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 51 Franklin Street,
@@ -97,6 +97,6 @@ GR_PYTHON_INSTALL(
     ${CMAKE_CURRENT_SOURCE_DIR}/gr-perf-monitorx
     ${CMAKE_CURRENT_SOURCE_DIR}/gr-ctrlport-curses
     DESTINATION ${GR_RUNTIME_DIR}
-    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE 
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     COMPONENT "runtime_python"
 )
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
index 78b83c2411..661705d613 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
@@ -184,7 +184,7 @@ class GrDataPlotParent(gr.top_block, QtGui.QWidget):
                     data[n] = [data[n],]
                 data[n] = self.data_to_complex(data[n])
                 self.src[n].set_data(data[n])
-            
+
 
 
 class GrDataPlotterC(GrDataPlotParent):
@@ -236,7 +236,7 @@ class GrDataPlotterF(GrDataPlotParent):
                                 self._name, self._ncons)
         snk.enable_autoscale(True)
         return snk
-    
+
     def get_vecsource(self):
         return blocks.vector_source_f([])
 
@@ -246,7 +246,7 @@ class GrDataPlotterF(GrDataPlotParent):
 
     def set_line_label(self, n, name):
         self.snk.set_line_label(n, self.knobnames[n])
-            
+
 
 class GrDataPlotterConst(GrDataPlotParent):
     def __init__(self, name, rate, pmin=None, pmax=None, stripchart=False):
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py b/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
index 4657482c3e..87998f7911 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
@@ -64,7 +64,7 @@ class IceRadioClient(Ice.Application):
         if self.useglacier:
 	  gstring = ginst + "/router -t:tcp -h " + ghost + " -p " + gport
 	  print "GLACIER: {0}".format(gstring)
-	  
+
 	  setrouter = Glacier2.RouterPrx.checkedCast(self.communicator().stringToProxy(gstring))
 	  self.communicator().setDefaultRouter(setrouter)
           defaultRouter = self.communicator().getDefaultRouter()
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
index 031c3b424e..cfb30ce850 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
@@ -1,18 +1,18 @@
 #
 # Copyright 2012 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GNU Radio
-# 
+#
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
-# 
+#
 # GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
index 1bee3b1a1e..f40c87a6d8 100755
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
@@ -43,7 +43,7 @@ class modem_monitor(threading.Thread):
     def __del__(self):
         rx.close()
 
-    def run(self):                
+    def run(self):
         while self.running:
             time.sleep(0.5)
 
@@ -80,7 +80,7 @@ class modem_window(threading.Thread):
         self.ssel = 0
         self.start()
         #self.updateGUI()
-        
+
         # input loop
         while(self.running):
             self.getInput()
@@ -239,7 +239,7 @@ class monitor_gui:
                     self.updateGUI()
                 except:
                     pass
-        
+
     def shutdown(self):
         curses.endwin()
         os._exit(0)
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
index 56cb2f3696..76dd2e5bc1 100755
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
@@ -53,7 +53,7 @@ class MAINWindow(QtGui.QMainWindow):
         return Qtgui.QSize(800,600)
 
     def __init__(self, radio, port, interface):
-        
+
         super(MAINWindow, self).__init__()
         self.updateRate = 1000;
         self.conns = []
@@ -195,11 +195,11 @@ class MAINWindow(QtGui.QMainWindow):
             else:
                 self.newPlotC(tag, uid, title, pmin, pmax,
                               log, strip, stem)
-            
+
         elif(disp & gr.DISPXY):
             scatter = disp & gr.DISPOPTSCATTER
             self.newPlotConst(tag, uid, title, pmin, pmax, scatter)
-            
+
         elif(disp & gr.DISPPSD):
             if(disp & gr.DISPOPTCPLX == 0):
                 self.newPlotPsdF(tag, uid, title)
@@ -215,7 +215,7 @@ class MAINWindow(QtGui.QMainWindow):
         knobprop = self.knobprops[tree.uid][tag]
         disp = knobprop.display
         iscomplex = (disp & gr.DISPOPTCPLX) or (disp & gr.DISPXY)
-        
+
         if(disp != gr.DISPNULL):
             data = "PlotData:::{0}:::{1}".format(tag, iscomplex)
         else:
@@ -268,8 +268,8 @@ class MAINWindow(QtGui.QMainWindow):
         plot = GrDataPlotterConst(tag, 32e6, pmin, pmax, stripchart)
         plot.scatter(scatter)
         self.createPlot(plot, uid, title)
-    
-    def newPlotF(self, tag, uid, title="", pmin=None, pmax=None, 
+
+    def newPlotF(self, tag, uid, title="", pmin=None, pmax=None,
                  logy=False, stripchart=False, stem=False):
         plot = GrDataPlotterF(tag, 32e6, pmin, pmax, stripchart)
         plot.semilogy(logy)
@@ -461,7 +461,7 @@ class ConInfoDialog(QtGui.QDialog):
         super(ConInfoDialog, self).__init__(parent)
 
         self.gridLayout = QtGui.QGridLayout(self)
-        
+
 
         self.host = QtGui.QLineEdit(self);
         self.port = QtGui.QLineEdit(self);
@@ -515,7 +515,7 @@ class UpdaterWindow(QtGui.QDialog):
             self.buttonlayout = QtGui.QHBoxLayout()
             self.buttonlayout.addWidget(self.cancelButton)
             self.layout.addLayout(self.buttonlayout)
- 
+
         else: # we have a set function
             self.textInput = QtGui.QLineEdit()
             self.layout.addWidget(self.textInput)
@@ -535,7 +535,7 @@ class UpdaterWindow(QtGui.QDialog):
             self.applyButton.connect(self.applyButton, QtCore.SIGNAL('clicked()'), self._apply)
             self.setButton.connect(self.setButton, QtCore.SIGNAL('clicked()'), self._set)
             self.cancelButton.connect(self.cancelButton, QtCore.SIGNAL('clicked()'), self.reject)
- 
+
             self.is_num = ((type(self.sv.value)==float) or (type(self.sv.value)==int))
             if(self.is_num):
                 self.sliderlayout = QtGui.QHBoxLayout()
@@ -548,7 +548,7 @@ class UpdaterWindow(QtGui.QDialog):
 
                 self.steps = 10000
                 self.valspan = self.props.max.value - self.props.min.value
-            
+
                 self.slider.setRange(0, 10000)
                 self._set_slider_value(self.sv.value)
 
@@ -566,10 +566,10 @@ class UpdaterWindow(QtGui.QDialog):
 
         # set layout and go...
         self.setLayout(self.layout)
-            
+
     def _set_slider_value(self, val):
         self.slider.setValue(self.steps*(val-self.props.min.value)/self.valspan)
-             
+
     def _slide(self):
         val = (self.slider.value()*self.valspan + self.props.min.value)/float(self.steps)
         self.textInput.setText(str(val))
@@ -611,7 +611,7 @@ class MForm(QtGui.QWidget):
             ft = time.time();
             latency = ft-st;
             self.parent.statusBar().showMessage("Current GNU Radio Control Port Query Latency: %f ms"%(latency*1000))
-            
+
         except Exception, e:
             sys.stderr.write("ctrlport-monitor: radio.get threw exception ({0}).\n".format(e))
             if(type(self.parent) is MAINWindow):
@@ -626,7 +626,7 @@ class MForm(QtGui.QWidget):
                     for plot in self.parent.plots[self.uid]:
                         if plot.qwidget() == p.widget():
                             remove.append(p)
-                
+
                 # Clean up local references to these
                 self.parent.conns.remove(self.parent.conns[self.uid])
                 self.parent.plots.remove(self.parent.plots[self.uid])
@@ -642,7 +642,7 @@ class MForm(QtGui.QWidget):
             return
 
         tableitems = knobs.keys()
-            
+
         #UPDATE TABLE:
         try:
             self.table.updateItems(knobs, self.knobprops)
@@ -666,7 +666,7 @@ class MForm(QtGui.QWidget):
             else:
                 self.radio = None
                 return
-        
+
         self.uid = uid
         self.parent = parent
         self.horizontalLayout = QtGui.QVBoxLayout(self)
@@ -680,7 +680,7 @@ class MForm(QtGui.QWidget):
         self.constupdatediv = 0
         self.tableupdatediv = 0
         plotsize=250
-            
+
         # make table
         self.table = GrDataPlotterValueTable(uid, self, 0, 0, 400, 200)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
@@ -692,12 +692,12 @@ class MForm(QtGui.QWidget):
         # add things to layouts
         self.horizontalLayout.addWidget(self.table.treeWidget)
 
-        # set up timer   
+        # set up timer
         self.connect(self.timer, QtCore.SIGNAL('timeout()'), self.update)
         self.updateRate = updateRate;
         self.timer.start(self.updateRate)
 
-        # set up context menu .. 
+        # set up context menu ..
         self.table.treeWidget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.table.treeWidget.customContextMenuRequested.connect(self.openMenu)
 
@@ -710,13 +710,13 @@ class MForm(QtGui.QWidget):
         self.connect(self.table.treeWidget,
                      QtCore.SIGNAL('itemPressed(QTreeWidgetItem*, int)'),
                      self.parent.startDrag)
-        
+
     def openMenu(self, pos):
         index = self.table.treeWidget.selectedIndexes()
         item = self.table.treeWidget.itemFromIndex(index[0])
         itemname = str(item.text(0))
         self.parent.propertiesMenu(itemname, self.radio, self.uid)
-        
+
 
 def get_minmax(p):
     pmin = p.min.value
@@ -733,7 +733,7 @@ def get_minmax(p):
         pmin = struct.unpack('b', pmin)[0]
     if(type(pmax) == str):
         pmax = struct.unpack('b', pmax)[0]
-        
+
     if pmin == []:
         pmin = None
     else:
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
index f2c01691a1..612eb66063 100755
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
@@ -38,7 +38,7 @@ class MAINWindow(QtGui.QMainWindow):
         return QtGui.QSize(800,600)
 
     def __init__(self, radio, port, interface):
-        
+
         super(MAINWindow, self).__init__()
         self.conns = []
         self.plots = []
@@ -223,7 +223,7 @@ class ConInfoDialog(QtGui.QDialog):
         super(ConInfoDialog, self).__init__(parent)
 
         self.gridLayout = QtGui.QGridLayout(self)
-        
+
 
         self.host = QtGui.QLineEdit(self);
         self.port = QtGui.QLineEdit(self);
@@ -270,13 +270,13 @@ class UpdaterWindow(QtGui.QDialog):
         self.buttonlayout = QtGui.QHBoxLayout()
         self.buttonlayout.addWidget(self.cancelButton)
         self.layout.addLayout(self.buttonlayout)
- 
+
         # set layout and go...
         self.setLayout(self.layout)
-            
+
     def _set_slider_value(self, val):
         self.slider.setValue(self.steps*(val-self.props.min.value)/self.valspan)
-             
+
     def _slide(self):
         val = (self.slider.value()*self.valspan + self.props.min.value)/float(self.steps)
         self.textInput.setText(str(val))
@@ -368,7 +368,7 @@ class MForm(QtGui.QWidget):
             latency = ft-st
             self.parent.statusBar().showMessage("Current GNU Radio Control Port Query Latency: %f ms"%\
                                                     (latency*1000))
-            
+
         except Exception, e:
             sys.stderr.write("ctrlport-monitor: radio.get threw exception ({0}).\n".format(e))
             if(type(self.parent) is MAINWindow):
@@ -383,7 +383,7 @@ class MForm(QtGui.QWidget):
                     for plot in self.parent.plots[self.uid]:
                         if plot.qwidget() == p.widget():
                             remove.append(p)
-                
+
                 # Clean up local references to these
                 self.parent.conns.remove(self.parent.conns[self.uid])
                 self.parent.plots.remove(self.parent.plots[self.uid])
@@ -397,13 +397,13 @@ class MForm(QtGui.QWidget):
             else:
                 sys.exit(1)
             return
-            
+
         #UPDATE TABLE:
         self.updateItems(knobs)
 
         #UPDATE PLOTS
         self.parent.update(knobs, self.uid)
-    
+
     def updateItems(self, knobs):
         for b in self.block_dict:
             if(knobs[b[0]].ice_id.im_class == GNURadio.KnobVecF):
@@ -424,7 +424,7 @@ class MForm(QtGui.QWidget):
             else:
                 self.radio = None
                 return
-        
+
         self.uid = uid
         self.parent = parent
         self.layout = QtGui.QGridLayout(self)
@@ -500,7 +500,7 @@ class MForm(QtGui.QWidget):
             for col, block in enumerate(blockrow):
                 if(block == ''):
                     continue
-                
+
                 bgroup = QtGui.QGroupBox(block)
                 playout = QtGui.QFormLayout()
                 bgroup.setLayout(playout)
@@ -539,7 +539,7 @@ class MForm(QtGui.QWidget):
                     bufflayout = QtGui.QFormLayout()
                     buffgroup.setLayout(bufflayout)
                     self.layout.addWidget(buffgroup, row, 2*col+1)
-                
+
                     i = int(block.split(":")[1])
                     name = output_name(blockname)
                     obuff = knobs[name].value
@@ -550,7 +550,7 @@ class MForm(QtGui.QWidget):
                         self.block_dict.append((name, newobuff, i))
                         bufflayout.addRow("Out Buffer {0}".format(i),
                                           newobuff)
-                
+
                 if blockname in blocks or blockname in sinks:
                     item = self.layout.itemAtPosition(row, 2*col-1)
                     if(item):
@@ -561,7 +561,7 @@ class MForm(QtGui.QWidget):
                         bufflayout = QtGui.QFormLayout()
                         buffgroup.setLayout(bufflayout)
                         self.layout.addWidget(buffgroup, row, 2*col-1)
-                
+
                     i = int(block.split(":")[1])
                     name = input_name(blockname)
                     ibuff = knobs[name].value[i]
@@ -582,7 +582,7 @@ class MForm(QtGui.QWidget):
         item = self.table.treeWidget.itemFromIndex(index[0])
         itemname = str(item.text(0))
         self.parent.propertiesMenu(itemname, self.radio, self.uid)
-        
+
 
 class MyClient(IceRadioClient):
     def __init__(self):
diff --git a/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
index 489b6ab255..b7c5ac2fe1 100644
--- a/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
+++ b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
@@ -27,10 +27,10 @@ import sys
 
 def tcp_connect_or_die(sock_addr):
     """
-    
+
     Args:
         sock_addr: (host, port) to connect to (tuple)
-    
+
     Returns:
         : socket or exits
     """
@@ -45,10 +45,10 @@ def tcp_connect_or_die(sock_addr):
 
 def udp_connect_or_die(sock_addr):
     """
-    
+
     Args:
         sock_addr: (host, port) to connect to (tuple)
-    
+
     Returns:
         : socket or exits
     """
diff --git a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
index 39cfc05dd6..e63ade1843 100755
--- a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
+++ b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
@@ -30,7 +30,7 @@ class test_pmt_to_python(unittest.TestCase):
         b = pmt.from_double(123765)
         self.assertEqual(pmt.to_python(b), 123765)
         t = pmt.to_pmt(range(5))
-    
+
     def test_numpy_to_uvector_and_reverse(self):
         import numpy as np
         N = 100
author	Tom Rondeau <tom@trondeau.com>	2014-07-07 12:18:00 -0400
committer	Tom Rondeau <tom@trondeau.com>	2014-07-07 12:18:00 -0400
commit	597b93798a804cde1783d6d2ab53b348d57c44cd (patch)
tree	b65e73bb0de634ff5d209b15971ebdabf369a45c /gnuradio-runtime/python
parent	1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff)