diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-uhd/python/uhd | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/python/uhd')
| -rw-r--r-- | gr-uhd/python/uhd/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-uhd/python/uhd/__init__.py b/gr-uhd/python/uhd/__init__.py index 6d7f232466..0e8176f97f 100644 --- a/gr-uhd/python/uhd/__init__.py +++ b/gr-uhd/python/uhd/__init__.py @@ -72,8 +72,8 @@ def _prepare_uhd_swig(): def __init__(self, *args, **kwargs): super(stream_args_t, self).__init__(*args) for key, val in kwargs.iteritems(): - #for some reason, i cant assign a list in the constructor - #but what i can do is append the elements individually + #for some reason, I can't assign a list in the constructor + #but what I can do is append the elements individually if key == 'channels': for v in val: self.channels.append(v) elif key == 'args': @@ -116,7 +116,7 @@ def _prepare_uhd_swig(): if len(args) > index: args[index] = cast(args[index]) if kwargs.has_key(key): kwargs[key] = cast(kwargs[key]) except: pass - #dont pass kwargs, it confuses swig, map into args list: + #don't pass kwargs, it confuses swig, map into args list: for key in ('device_addr', 'stream_args', 'io_type', 'num_channels', 'msgq'): if kwargs.has_key(key): args.append(kwargs[key]) return old_constructor(*args) |