From 7a0948ba85758fba1cc3858ef99bfa600dcc7416 Mon Sep 17 00:00:00 2001
From: mormj <mormjb@gmail.com>
Date: Fri, 30 Oct 2020 10:59:50 -0400
Subject: qa: run autopep8 formatting on qa python files
find ./ -iname qa*.py | xargs autopep8 --in-place -a -a
mostly formats whitespace and gets rid of trailing semicolons
---
.../python/gnuradio/gr/qa_flowgraph.py | 9 ++--
.../python/gnuradio/gr/qa_hier_block2.py | 48 ++++++++++++++--------
.../python/gnuradio/gr/qa_kludged_imports.py | 1 +
gnuradio-runtime/python/gnuradio/gr/qa_prefs.py | 6 ++-
gnuradio-runtime/python/gnuradio/gr/qa_random.py | 3 +-
.../python/gnuradio/gr/qa_tag_utils.py | 9 ++--
gnuradio-runtime/python/pmt/qa_pmt.py | 14 ++++---
gnuradio-runtime/python/pmt/qa_pmt_to_python.py | 5 +--
8 files changed, 55 insertions(+), 40 deletions(-)
(limited to 'gnuradio-runtime/python')
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py b/gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py
index 1907656592..893b02cb07 100644
--- a/gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py
@@ -13,12 +13,13 @@ import time
import pmt
from gnuradio import gr, gr_unittest, blocks
+
class test_flowgraph (gr_unittest.TestCase):
- def setUp (self):
- self.tb = gr.top_block ()
+ def setUp(self):
+ self.tb = gr.top_block()
- def tearDown (self):
+ def tearDown(self):
self.tb = None
def test_000(self):
@@ -42,6 +43,6 @@ class test_flowgraph (gr_unittest.TestCase):
data = pmt.u8vector_elements(pmt.cdr(dbg.get_message(0)))
self.assertEqual([1, 2, 3], data)
+
if __name__ == '__main__':
gr_unittest.run(test_flowgraph)
-
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_hier_block2.py b/gnuradio-runtime/python/gnuradio/gr/qa_hier_block2.py
index a5895e8db0..3e42c79b7d 100644
--- a/gnuradio-runtime/python/gnuradio/gr/qa_hier_block2.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_hier_block2.py
@@ -15,27 +15,27 @@ import pmt
class test_hblk(gr.hier_block2):
- def __init__(self, io_sig=1*[gr.sizeof_gr_complex], ndebug=2):
+ def __init__(self, io_sig=1 * [gr.sizeof_gr_complex], ndebug=2):
# parent constructor
- gr.hier_block2.__init__(self,
- "test_hblk",
- gr.io_signature(len(io_sig), len(io_sig), io_sig[0]),
- gr.io_signature(0,0,0))
+ gr.hier_block2.__init__(
+ self, "test_hblk", gr.io_signature(
+ len(io_sig), len(io_sig), io_sig[0]), gr.io_signature(
+ 0, 0, 0))
- self.message_port_register_hier_in("msg_in");
+ self.message_port_register_hier_in("msg_in")
# Internal Stream Blocks
self.vsnk = blocks.vector_sink_c()
# Internal Msg Blocks
- self.blks = [];
+ self.blks = []
for i in range(0, ndebug):
- self.blks.append( blocks.message_debug() )
+ self.blks.append(blocks.message_debug())
# Set up internal connections
- self.connect( self, self.vsnk )
+ self.connect(self, self.vsnk)
for blk in self.blks:
- self.msg_connect( self, "msg_in", blk, "print" )
+ self.msg_connect(self, "msg_in", blk, "print")
class test_hier_block2(gr_unittest.TestCase):
@@ -103,30 +103,42 @@ class test_hier_block2(gr_unittest.TestCase):
self.multi(self.Block(), 5)
def test_010(self):
- s, h, k = analog.sig_source_c(44100, analog.GR_COS_WAVE, 440, 1.0, 0.0), blocks.head(gr.sizeof_gr_complex, 1000), test_hblk([gr.sizeof_gr_complex], 0)
+ s, h, k = analog.sig_source_c(44100, analog.GR_COS_WAVE, 440, 1.0, 0.0), blocks.head(
+ gr.sizeof_gr_complex, 1000), test_hblk([gr.sizeof_gr_complex], 0)
tb = gr.top_block()
- tb.connect(s,h,k)
+ tb.connect(s, h, k)
tb.run()
def test_011(self):
- s, st, h, k = analog.sig_source_c(44100, analog.GR_COS_WAVE, 440, 1.0, 0.0), blocks.message_strobe(pmt.PMT_NIL, 100), blocks.head(gr.sizeof_gr_complex, 1000), test_hblk([gr.sizeof_gr_complex], 1)
+ s, st, h, k = analog.sig_source_c(
+ 44100, analog.GR_COS_WAVE, 440, 1.0, 0.0), blocks.message_strobe(
+ pmt.PMT_NIL, 100), blocks.head(
+ gr.sizeof_gr_complex, 1000), test_hblk(
+ [
+ gr.sizeof_gr_complex], 1)
tb = gr.top_block()
- tb.connect(s,h,k)
- tb.msg_connect(st,"strobe",k,"msg_in")
+ tb.connect(s, h, k)
+ tb.msg_connect(st, "strobe", k, "msg_in")
tb.start()
time.sleep(1)
tb.stop()
tb.wait()
def test_012(self):
- s, st, h, k = analog.sig_source_c(44100, analog.GR_COS_WAVE, 440, 1.0, 0.0), blocks.message_strobe(pmt.PMT_NIL, 100), blocks.head(gr.sizeof_gr_complex, 1000), test_hblk([gr.sizeof_gr_complex], 16)
+ s, st, h, k = analog.sig_source_c(
+ 44100, analog.GR_COS_WAVE, 440, 1.0, 0.0), blocks.message_strobe(
+ pmt.PMT_NIL, 100), blocks.head(
+ gr.sizeof_gr_complex, 1000), test_hblk(
+ [
+ gr.sizeof_gr_complex], 16)
tb = gr.top_block()
- tb.connect(s,h,k)
- tb.msg_connect(st,"strobe",k,"msg_in")
+ tb.connect(s, h, k)
+ tb.msg_connect(st, "strobe", k, "msg_in")
tb.start()
time.sleep(1)
tb.stop()
tb.wait()
+
if __name__ == '__main__':
gr_unittest.run(test_hier_block2)
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_kludged_imports.py b/gnuradio-runtime/python/gnuradio/gr/qa_kludged_imports.py
index 401fa7ddae..257aa3a761 100644
--- a/gnuradio-runtime/python/gnuradio/gr/qa_kludged_imports.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_kludged_imports.py
@@ -11,6 +11,7 @@
from gnuradio import gr, gr_unittest
+
class test_kludged_imports (gr_unittest.TestCase):
def setUp(self):
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py b/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py
index fcda8f7b53..f5a8c93baf 100644
--- a/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py
@@ -9,9 +9,9 @@
#
-
from gnuradio import gr, gr_unittest
+
class test_prefs (gr_unittest.TestCase):
def test_001(self):
@@ -21,7 +21,9 @@ class test_prefs (gr_unittest.TestCase):
self.assertFalse(p.has_option('doesnt', 'exist'))
# At the time these tests are run, there is not necessarily a default
- # configuration on the build system, so not much to do with testing here
+ # configuration on the build system, so not much to do with testing
+ # here
+
if __name__ == '__main__':
gr_unittest.run(test_prefs)
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_random.py b/gnuradio-runtime/python/gnuradio/gr/qa_random.py
index 24823487e2..fa8c44917b 100644
--- a/gnuradio-runtime/python/gnuradio/gr/qa_random.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_random.py
@@ -14,7 +14,8 @@ import numpy as np
class test_random(gr_unittest.TestCase):
- # NOTE: For tests on the output distribution of the random numbers, see gnuradio-runtime/apps/evaluation_random_numbers.py.
+ # NOTE: For tests on the output distribution of the random numbers, see
+ # gnuradio-runtime/apps/evaluation_random_numbers.py.
# Check for range [0,1) of uniform distributed random numbers
def test_1(self):
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
index b3a510f98a..96706377a3 100644
--- a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
@@ -9,18 +9,16 @@
#
-
from gnuradio import gr, gr_unittest
import pmt
class test_tag_utils (gr_unittest.TestCase):
- def setUp (self):
- self.tb = gr.top_block ()
-
+ def setUp(self):
+ self.tb = gr.top_block()
- def tearDown (self):
+ def tearDown(self):
self.tb = None
def test_001(self):
@@ -100,4 +98,3 @@ class test_tag_utils (gr_unittest.TestCase):
if __name__ == '__main__':
print('hi')
gr_unittest.run(test_tag_utils)
-
diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
index 9a08ed39b4..1e879aae29 100644
--- a/gnuradio-runtime/python/pmt/qa_pmt.py
+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
@@ -12,10 +12,11 @@
import unittest
import pmt
+
class test_pmt(unittest.TestCase):
- MAXINT32 = (2**31)-1
- MININT32 = (-MAXINT32)-1
+ MAXINT32 = (2**31) - 1
+ MININT32 = (-MAXINT32) - 1
def setUp(self):
from ctypes import sizeof, c_long
@@ -204,7 +205,8 @@ class test_pmt(unittest.TestCase):
out_str = pmt.serialize_str(d)
self.assertEqual(out_str, in_str)
in_str = b'\t\x07\x02\x00\x03vec\n\x00\x00\x00\x00\x04\x01\x00\x01\x02\x03\x04\x06'
- d = pmt.dict_add(pmt.make_dict(), pmt.intern('vec'), pmt.init_u8vector(4, [1, 2, 3, 4]))
+ d = pmt.dict_add(pmt.make_dict(), pmt.intern('vec'),
+ pmt.init_u8vector(4, [1, 2, 3, 4]))
out_pmt = pmt.deserialize_str(in_str)
self.assertTrue(pmt.equal(out_pmt, d))
@@ -340,7 +342,7 @@ class test_pmt(unittest.TestCase):
self.assertEqual(out_vec, in_vec)
# c32_vector SERDES
- in_vec = [0x01020304-1j, 3.1415+99.99j]
+ in_vec = [0x01020304 - 1j, 3.1415 + 99.99j]
# old serialization (c32 serialized as c64):
# in_str = b'\n\n\x00\x00\x00\x02\x01\x00Ap 0@\x00\x00\x00\xbf\xf0\x00\x00\x00\x00\x00\x00@\t!\xca\xc0\x00\x00\x00@X\xff\\ \x00\x00\x00'
in_str = b'\n\n\x00\x00\x00\x02\x01\x00\xbf\x80\x00\x00K\x81\x01\x82B\xc7\xfa\xe1@I\x0eV'
@@ -349,7 +351,7 @@ class test_pmt(unittest.TestCase):
# old serialization (c32 serialized as c64):
# in_str = b'\n\n\x00\x00\x00\x02\x01\x00?\xf0\x00\x00\x00\x00\x00\x00?\xf0\x00\x00\x00\x00\x00\x00?\xc0\x00\x00\x00\x00\x00\x00\xc1c\x12\xcf\xe0\x00\x00\x00'
in_str = b'\n\n\x00\x00\x00\x02\x01\x00?\x80\x00\x00?\x80\x00\x00\xcb\x18\x96\x7f>\x00\x00\x00'
- in_vec = [1+1j, .125-9999999j]
+ in_vec = [1 + 1j, .125 - 9999999j]
out_vec = pmt.c32vector_elements(pmt.deserialize_str(in_str))
self.assertEqual(out_vec, in_vec)
@@ -359,7 +361,7 @@ class test_pmt(unittest.TestCase):
out_str = pmt.serialize_str(pmt.init_c64vector(len(in_vec), in_vec))
self.assertEqual(out_str, in_str)
in_str = b'\n\x0b\x00\x00\x00\x02\x01\x00?\xf0\x00\x00\x00\x00\x00\x00?\xf0\x00\x00\x00\x00\x00\x00?\xc0\x00\x00\x00\x00\x00\x00\xc1c\x12\xcf\xe0\x00\x00\x00'
- in_vec = [1+1j, .125-9999999j]
+ in_vec = [1 + 1j, .125 - 9999999j]
out_vec = pmt.c64vector_elements(pmt.deserialize_str(in_str))
self.assertEqual(out_vec, in_vec)
diff --git a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
index 3fed489d8c..0d96cb800d 100644
--- a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
+++ b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
@@ -9,11 +9,11 @@
#
-
import unittest
import pmt
from pmt import pmt_to_python as pmt2py
+
class test_pmt_to_python(unittest.TestCase):
def test_pmt_from_double(self):
@@ -29,10 +29,9 @@ class test_pmt_to_python(unittest.TestCase):
narr.imag[:] = np.random.uniform(size=N)
uvector = pmt2py.numpy_to_uvector(narr)
nparr = pmt2py.uvector_to_numpy(uvector)
- self.assertTrue(nparr.dtype==narr.dtype)
+ self.assertTrue(nparr.dtype == narr.dtype)
self.assertTrue(np.alltrue(nparr == narr))
-
if __name__ == '__main__':
unittest.main()
--
cgit v1.2.3