diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-07-14 14:44:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-07-14 14:44:42 -0700 |
| commit | e1fa3db39fcf38f1fefed4b3f6cc5f7b8d788933 (patch) | |
| tree | f1dea4b9faf8e93b0d4e5d732de1d2b09b18d508 /gnuradio-runtime/python | |
| parent | 89736b31397330861dcaa550b7891ce6e7a5536f (diff) | |
ctrlport: Remove superfluous 'import exceptions'
It's not needed, not even with Python 2.7. It will fail with Python 3,
though.
Diffstat (limited to 'gnuradio-runtime/python')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py | 22 |
2 files changed, 11 insertions, 15 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py b/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py index beec500023..8b811ab9d9 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py @@ -30,8 +30,6 @@ is currently the only supported transport. from __future__ import print_function from __future__ import unicode_literals -import exceptions - """ GNURadioControlPortClient is the main class for creating a GNU Radio ControlPort client application for all transports. @@ -131,4 +129,4 @@ class GNURadioControlPortClient(object): blockingcallback() else: print(("Unsupported RPC method: ", rpcmethod)) - raise exceptions.ValueError() + raise ValueError() diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py b/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py index b85c827f72..0f3f27710f 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # # Copyright 2015 Free Software Foundation, Inc. # @@ -18,9 +17,6 @@ from __future__ import unicode_literals # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # - -import exceptions - """ RPCMethods is a dictionary listing RPC transports currently supported by this client. @@ -31,6 +27,8 @@ Args: options: result of command argument parsing (optparse.Values) """ +from __future__ import unicode_literals + RPCMethods = {'thrift': 'Apache Thrift', #'ice': 'Zeroc ICE' } @@ -95,25 +93,25 @@ class RPCConnection(object): return self.port def newConnection(self, host=None, port=None): - raise exceptions.NotImplementedError() + raise NotImplementedError() def properties(self, *args): - raise exceptions.NotImplementedError() + raise NotImplementedError() def getKnobs(self, *args): - raise exceptions.NotImplementedError() + raise NotImplementedError() def getRe(self,*args): - raise exceptions.NotImplementedError() + raise NotImplementedError() def postMessage(self,*args): - raise exceptions.NotImplementedError() + raise NotImplementedError() def setKnobs(self,*args): - raise exceptions.NotImplementedError() + raise NotImplementedError() def shutdown(self): - raise exceptions.NotImplementedError() + raise NotImplementedError() def printProperties(self, props): - raise exceptions.NotImplementedError() + raise NotImplementedError() |