diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-24 10:19:49 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-24 10:19:49 -0700 |
| commit | e91ae54188e9812f3d8ed45e7f675e5a98ec889f (patch) | |
| tree | 01cf3aa2954926fa3c01514f322edce9034e9e21 /gr-uhd/swig | |
| parent | 7eebbcd5ed9f94904adf99967c928ec736779a4a (diff) | |
| parent | 87c8751c99cfb2191bea19557d158fdd952c56eb (diff) | |
Merge branch 'master' into next
Conflicts:
gr-uhd/lib/Makefile.am
Diffstat (limited to 'gr-uhd/swig')
| -rw-r--r-- | gr-uhd/swig/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py index d098a7b8a6..82dbdd9e75 100644 --- a/gr-uhd/swig/__init__.py +++ b/gr-uhd/swig/__init__.py @@ -55,6 +55,10 @@ def _prepare_uhd_swig(): def __new__(self, *args): return str.__new__(self) def __getitem__(self, key): return self.get(key) def __setitem__(self, key, val): self.set(key, val) + def __init__(self, *args, **kwargs): + super(device_addr_t, self).__init__(*args) + if args and isinstance(args[0], device_addr_t): + for key in args[0].keys(): self[key] = args[0][key] setattr(uhd_swig, 'device_addr_t', device_addr_t) #make the streamer args take **kwargs on init |