diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-12-07 18:18:29 +0100 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2020-12-08 16:08:48 -0800 |
| commit | d72041827ab0c545ea1011c0ff84359a4f46cf0d (patch) | |
| tree | eb72d2c9260ee952cbe7c4556bc1922deb12362e /mpm/python | |
| parent | 60fb5d5f1377f5a4af7e1e55b1ec83fed864153f (diff) | |
| download | uhd-d72041827ab0c545ea1011c0ff84359a4f46cf0d.tar.gz uhd-d72041827ab0c545ea1011c0ff84359a4f46cf0d.tar.bz2 uhd-d72041827ab0c545ea1011c0ff84359a4f46cf0d.zip | |
mpm: rpc server: Remove Python2 compat code
MPM is Python3-only, but contains some remaining compatibility code for
Python2. Because this code requires extra dependencies (like six) and
could become obsolete in the future, we remove it to preempt that.
No functional changes.
Diffstat (limited to 'mpm/python')
| -rw-r--r-- | mpm/python/usrp_mpm/rpc_server.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mpm/python/usrp_mpm/rpc_server.py b/mpm/python/usrp_mpm/rpc_server.py index 4e424c780..1b840ee87 100644 --- a/mpm/python/usrp_mpm/rpc_server.py +++ b/mpm/python/usrp_mpm/rpc_server.py @@ -22,9 +22,6 @@ from gevent import spawn_later from gevent import Greenlet from gevent import monkey monkey.patch_all() -from builtins import str, bytes -from builtins import range -from six import iteritems from contextlib import contextmanager from mprpc import RPCServer from usrp_mpm.mpmlog import get_main_logger @@ -436,7 +433,7 @@ class MPMServer(RPCServer): log_records = get_main_logger().get_log_buf() self.log.trace("Returning %d log records.", len(log_records)) return [ - {k: str(v) for k, v in iteritems(record)} + {k: str(v) for k, v in iter(record.items())} for record in log_records ] |