Last changes removing python 2.7

Author: jmgc

myhdl/conversion/_toVerilog.py

@@ -799,7 +799,7 @@ def visit_Call(self, node):
             self.write(opening)
             self.visit(fn.value)
             self.write(closing)
-        elif (type(f) in type) and issubclass(f, Exception):
+        elif (type(f) is type) and issubclass(f, Exception):
             self.write(f.__name__)
         elif f in (posedge, negedge):
             opening, closing = ' ', ''

myhdl/numeric/_sintba.py

@@ -346,10 +346,7 @@ def __ifloordiv__(self, other):
         return self
 
     def __imod__(self, other):
-        right = copy(other)
-        if self.high > other.high:
-            right = right.resize(self.high, other.low)
-        result = self % right
+        result = self % other
         if self.is_signed:
             value = result.resize(self.high, self.low)
         else:

myhdl/test/conversion/toVHDL/test_interfaces5.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
 from myhdl import Signal, intbv, always_seq, ResetSignal, now, \
     instance, delay, StopSimulation, Simulation, toVHDL
 from myhdl.conversion import analyze, verify

myhdl/test/numeric/test_sfixba.py

@@ -619,8 +619,8 @@ def testSetSlice(self):
                             ba[i:j] = val
                         except RuntimeWarning:
                             if isinstance(val, int):
-                                self.assertTrue((bit_length(val) > (i - j)) or
-                                                (bit_length(-1 - val) >
+                                self.assertTrue((val.bit_length() > (i - j)) or
+                                                ((-1 - val).bit_length() >
                                                  (i - j)))
                             else:
                                 self.assertTrue((len(val) != (i - j)) or \
@@ -651,9 +651,9 @@ def testSetSliceLeftOpen(self):
                         bai[:j] = -1 - val
                     except RuntimeWarning:
                         if isinstance(val, int):
-                            self.assertTrue((bit_length(val) >
+                            self.assertTrue((val.bit_length() >
                                              (ba.high - j)) or
-                                            (bit_length(-1-val) >
+                                            ((-1-val).bit_length() >
                                              (bai.high - j - 1)))
                         else:
                             self.assertTrue((len(val) != (ba.high - j)) or

myhdl/test/numeric/test_sintba.py

@@ -268,8 +268,8 @@ def testSetSlice(self):
                             ba[i:j] = val
                         except RuntimeWarning:
                             if isinstance(val, int):
-                                self.assertTrue((bit_length(val) > (i - j)) \
-                                                or (bit_length(-1 - val) > \
+                                self.assertTrue((val.bit_length() > (i - j)) \
+                                                or ((-1 - val).bit_length() > \
                                                     (i - j)))
                             else:
                                 self.assertTrue((len(val) != (i - j)) or \
@@ -299,9 +299,9 @@ def testSetSliceLeftOpen(self):
                         bai[:j] = -1 - val
                     except RuntimeWarning:
                         if isinstance(val, int):
-                            self.assertTrue((bit_length(val) > \
+                            self.assertTrue((val.bit_length() > \
                                              (len(ba) - j)) or \
-                                            (bit_length(-1-val) > \
+                                            ((-1-val).bit_length() > \
                                              (len(bai) - j - 1)))
                         else:
                             self.assertTrue((len(val) != (len(ba) - j)) or \
@@ -639,7 +639,7 @@ def testSliceAssign(self):
             try:
                 a[:] = v
             except RuntimeWarning:
-                self.assertTrue((bit_length(v) > len(a)) or (v < 0))
+                self.assertTrue((v.bit_length() > len(a)) or (v < 0))
         warnings.resetwarnings()
 
     def checkBounds(self, i, j, op):