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 /gnuradio-runtime/python | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime/python')
7 files changed, 8 insertions, 8 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py index c5bfd0a8cb..e0499c5eba 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py @@ -141,7 +141,7 @@ class GrDataPlotParent(gr.top_block, QtGui.QWidget): npts = self.get_npts() if(self._npts != npts): - # Adjust buffers to accomodate new settings + # Adjust buffers to accommodate new settings for n in xrange(self._ncons): if(npts < self._npts): if(self._data_len[n] < npts): diff --git a/gnuradio-runtime/python/gnuradio/gr/gateway.py b/gnuradio-runtime/python/gnuradio/gr/gateway.py index 2e46bca430..8403421dd5 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gateway.py +++ b/gnuradio-runtime/python/gnuradio/gr/gateway.py @@ -46,7 +46,7 @@ def pointer_to_ndarray(addr, dtype, nitems): ######################################################################## class gateway_handler(gr.feval_ll): - #dont put a constructor, it wont work + #don't put a constructor, it won't work def init(self, callback): self._callback = callback @@ -64,7 +64,7 @@ class gateway_handler(gr.feval_ll): ######################################################################## class msg_handler(gr.feval_p): - #dont put a constructor, it wont work + #don't put a constructor, it won't work def init(self, callback): self._callback = callback diff --git a/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py index dee8034c1c..795c1593d4 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py +++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py @@ -106,7 +106,7 @@ class _RLock(_Verbose): self.__owner = me self.__count = 1 if __debug__: - self._note("%s.acquire(%s): initial succes", self, blocking) + self._note("%s.acquire(%s): initial success", self, blocking) else: if __debug__: self._note("%s.acquire(%s): failure", self, blocking) diff --git a/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py index 8539bfc047..8ad880b090 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py +++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py @@ -106,7 +106,7 @@ class _RLock(_Verbose): self.__owner = me self.__count = 1 if __debug__: - self._note("%s.acquire(%s): initial succes", self, blocking) + self._note("%s.acquire(%s): initial success", self, blocking) else: if __debug__: self._note("%s.acquire(%s): failure", self, blocking) diff --git a/gnuradio-runtime/python/gnuradio/gr_unittest.py b/gnuradio-runtime/python/gnuradio/gr_unittest.py index c729566e88..b20fa076de 100755 --- a/gnuradio-runtime/python/gnuradio/gr_unittest.py +++ b/gnuradio-runtime/python/gnuradio/gr_unittest.py @@ -40,7 +40,7 @@ class TestCase(unittest.TestCase): (default 7) and comparing to zero. Note that decimal places (from zero) is usually not the same - as significant digits (measured from the most signficant digit). + as significant digits (measured from the most significant digit). """ if round(second.real-first.real, places) != 0: raise self.failureException, \ diff --git a/gnuradio-runtime/python/gnuradio/gru/freqz.py b/gnuradio-runtime/python/gnuradio/gru/freqz.py index 6d8b94db8b..a24d13ddee 100644 --- a/gnuradio-runtime/python/gnuradio/gru/freqz.py +++ b/gnuradio-runtime/python/gnuradio/gru/freqz.py @@ -118,7 +118,7 @@ class poly1d: p[k] is the coefficient on the kth power of x (backwards from sequencing the coefficient array. - polynomials can be added, substracted, multplied and divided (returns + polynomials can be added, substracted, multiplied and divided (returns quotient and remainder). asarray(p) will also give the coefficient array, so polynomials can be used in all functions that accept arrays. diff --git a/gnuradio-runtime/python/pmt/pmt_to_python.py b/gnuradio-runtime/python/pmt/pmt_to_python.py index f9000ec279..2909c93c21 100644 --- a/gnuradio-runtime/python/pmt/pmt_to_python.py +++ b/gnuradio-runtime/python/pmt/pmt_to_python.py @@ -91,7 +91,7 @@ def numpy_to_uvector(numpy_array): pc = map(mapping[1], numpy.ravel(numpy_array)) return mapping[0](numpy_array.size, pc) except KeyError: - raise ValueError("unsupported numpy array dtype for converstion to pmt %s"%(numpy_array.dtype)) + raise ValueError("unsupported numpy array dtype for conversion to pmt %s"%(numpy_array.dtype)) def uvector_to_numpy(uvector): match = None |