Pylint fixes

abs-tudelft · Oct 7, 2019 · 537dcc4 · 537dcc4
1 parent 0ef939d
commit 537dcc4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/tests/vhdl/test_interface.py b/tests/vhdl/test_interface.py
@@ -53,7 +53,7 @@ def gen_basic_interface(group, flatten):
     def test_ungrouped_unflattened(self):
         """test ungrouped, unflattened interface generation"""
         result = self.gen_basic_interface(False, False)
-        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result
+        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result #pylint: disable=W0632
         self.assertEqual('\n\n'.join(iface.generate('port')), '\n'.join([
             '@ Interface for field foo: a scalar field.',
             'f_foo_i : in tns_f_foo_i_type@:= TNS_F_FOO_I_RESET;',
@@ -128,7 +128,7 @@ def test_ungrouped_unflattened(self):
     def test_grouped_unflattened(self):
         """test grouped, unflattened interface generation"""
         result = self.gen_basic_interface('test', False)
-        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result
+        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result #pylint: disable=W0632
         self.assertEqual('\n\n'.join(iface.generate('port')), '\n'.join([
             '@ Interface group for:',
             '@  - field bar: a vector field.',
@@ -224,7 +224,7 @@ def test_grouped_unflattened(self):
     def test_ungrouped_flattened_records(self):
         """test ungrouped, record-flattened interface generation"""
         result = self.gen_basic_interface(False, 'record')
-        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result
+        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result #pylint: disable=W0632
         self.assertEqual('\n\n'.join(iface.generate('port')), '\n'.join([
             '@ Interface for field foo: a scalar field.',
             'f_foo_data : in std_logic_vector(7 downto 0)@:= (others => \'0\');',
@@ -260,7 +260,7 @@ def test_ungrouped_flattened_records(self):
     def test_grouped_flattened_records(self):
         """test grouped, record-flattened interface generation"""
         result = self.gen_basic_interface('test', 'record')
-        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result
+        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result #pylint: disable=W0632
         self.assertEqual('\n\n'.join(iface.generate('port')), '\n'.join([
             '@ Interface group for:',
             '@  - field bar: a vector field.',
@@ -319,7 +319,7 @@ def test_grouped_flattened_records(self):
     def test_ungrouped_flattened(self):
         """test ungrouped, array-flattened interface generation"""
         result = self.gen_basic_interface(False, True)
-        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result
+        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result #pylint: disable=W0632
         self.assertEqual('\n\n'.join(iface.generate('port')), '\n'.join([
             '@ Interface for field foo: a scalar field.',
             'f_foo_data : in std_logic_vector(7 downto 0)@:= (others => \'0\');',
@@ -353,7 +353,7 @@ def test_ungrouped_flattened(self):
     def test_grouped_flattened(self):
         """test grouped, array-flattened interface generation"""
         result = self.gen_basic_interface('test', True)
-        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result
+        iface, foo_d, foo_v, foo_r, foo_e, bar_d, bar_v, bar_r, bar_e = result #pylint: disable=W0632
         self.assertEqual('\n\n'.join(iface.generate('port')), '\n'.join([
             '@ Interface group for:',
             '@  - field bar: a vector field.',

diff --git a/vhdmmio/configurable/choice.py b/vhdmmio/configurable/choice.py
@@ -221,7 +221,7 @@ def with_mods(self, *choices_to_keep):
         becomes the new default value. Choices can be specified either as just
         a descriptor or as a two-tuple of a descriptor and a new documentation
         string."""
-        current_choices = {desc: doc for desc, doc in self._choices}
+        current_choices = dict(self._choices)
         new_choices = []
         for choice_tuple in choices_to_keep:
             desc, doc = choice_tuple if isinstance(choice_tuple, tuple) else (choice_tuple, None)

diff --git a/vhdmmio/html/__init__.py b/vhdmmio/html/__init__.py
@@ -220,8 +220,6 @@ def insert_cell(content=None, col_span=1, row_span=1):
 
                 if len(abbreviated) > mapping.col_span*4-1:
                     abbreviated = abbreviated[:mapping.col_span*4-2] + '…'
-                else:
-                    abbreviated = abbreviated
 
                 cell = (
                     '<div class="tooltip-right">\n'

diff --git a/vhdmmio/template.py b/vhdmmio/template.py
@@ -622,16 +622,14 @@ def _process_wrapping(self, text, comment, wrap, annotate): #pylint disable=R091
                         paragraph_buffer.extend(line.split())
                         continue
 
-                    else:
-
-                        # Not a continuation of the buffered paragraph. Output the
-                        # current buffer so we can start a new one.
-                        output_lines.extend(self._wrap(
-                            paragraph_buffer_leading,
-                            paragraph_buffer_hanging,
-                            paragraph_buffer,
-                            wrap))
-                        paragraph_buffer = None
+                    # Not a continuation of the buffered paragraph. Output the
+                    # current buffer so we can start a new one.
+                    output_lines.extend(self._wrap(
+                        paragraph_buffer_leading,
+                        paragraph_buffer_hanging,
+                        paragraph_buffer,
+                        wrap))
+                    paragraph_buffer = None
 
                 if line: