diff options
| author | Andrej Rode <mail@andrejro.de> | 2018-08-06 01:09:43 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-17 19:59:23 +0200 |
| commit | 48d535e9d9d95524b2c8ed35b44c7eda541aea68 (patch) | |
| tree | a4511ac107e9d7ebb4b650dbd5ea8fb63e67d0a6 /gr-digital/python | |
| parent | 6bfe4661a87cb7fc5f47ec219e89f8e6215bd03f (diff) | |
python: replace unfunctional old_div with functional code
a previous change to py3k introduced synactically incorrect
`old_div` function calls. A replacement with `//` and `/` where applicable is
more appropriate.
Eventually `from __future__ import division` needs to be added as well to have
the "real" division also for integer values in python
closes #1902
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/digital/gmsk.py | 4 | ||||
| -rw-r--r-- | gr-digital/python/digital/ofdm_receiver.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gr-digital/python/digital/gmsk.py b/gr-digital/python/digital/gmsk.py index 5e25a3d3a1..9428e5237f 100644 --- a/gr-digital/python/digital/gmsk.py +++ b/gr-digital/python/digital/gmsk.py @@ -93,7 +93,7 @@ class gmsk_mod(gr.hier_block2): raise TypeError("samples_per_symbol must be an integer >= 2, is %r" % (samples_per_symbol,)) ntaps = 4 * samples_per_symbol # up to 3 bits in filter at once - sensitivity = (old_div(pi / 2), samples_per_symbol) # phase change per bit = pi / 2 + sensitivity = (pi / 2) / samples_per_symbol # phase change per bit = pi / 2 # Turn it into NRZ data. #self.nrz = digital.bytes_to_syms() @@ -216,7 +216,7 @@ class gmsk_demod(gr.hier_block2): self._gain_omega = .25 * self._gain_mu * self._gain_mu # critically damped # Demodulate FM - sensitivity = (old_div(pi / 2), samples_per_symbol) + sensitivity = (pi / 2) / samples_per_symbol self.fmdemod = analog.quadrature_demod_cf(1.0 / sensitivity) # the clock recovery block tracks the symbol clock and resamples as needed. diff --git a/gr-digital/python/digital/ofdm_receiver.py b/gr-digital/python/digital/ofdm_receiver.py index d23b338b78..0a9d79f728 100644 --- a/gr-digital/python/digital/ofdm_receiver.py +++ b/gr-digital/python/digital/ofdm_receiver.py @@ -69,7 +69,7 @@ class ofdm_receiver(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature gr.io_signature2(2, 2, gr.sizeof_gr_complex*occupied_tones, gr.sizeof_char)) # Output signature - bw = (old_div(float(occupied_tones) / float(fft_length)), 2.0) + bw = (float(occupied_tones) / float(fft_length)) / 2.0 tb = bw*0.08 chan_coeffs = filter.firdes.low_pass (1.0, # gain 1.0, # sampling rate |