Remove some support for older Python versions, which simplifies some code.

Author: fdxmw

pyrtl/rtllib/matrix.py

@@ -584,8 +584,6 @@ def __imatmul__(self, other):
 
         Is used with ``a @= b``.
 
-        Note: The matmul symbol (``@``) only works in Python 3.5+. Otherwise you must
-        call ``__imatmul__(other)``.
         '''
         new_value = self.__matmul__(other)
         self.columns = new_value.columns
@@ -602,8 +600,6 @@ def __matmul__(self, other):
 
         Is used with ``a @ b``.
 
-        Note: The matmul symbol (`@`) only works in Python 3.5+. Otherwise you must
-        call ``__matmul__(other)``.
         '''
         if not isinstance(other, Matrix):
             raise PyrtlError('error: expecting a Matrix, '
@@ -736,16 +732,15 @@ def get_value(ix):
             col = mat_ix % self.columns
             self[row, col] = get_value(v_ix)
 
-    def reshape(self, *newshape, **order):
-        ''' Create a matrix of the given shape from the current matrix.
+    def reshape(self, *newshape, order: str = "C"):
+        '''Create a matrix of the given shape from the current matrix.
 
         :param int/ints/tuple[int] newshape: shape of the matrix to return;
             if a single int, will result in a 1-D row-vector of that length;
             if a tuple, will use values for number of rows and cols. Can also
             be a varargs.
-        :param str order: ``C`` means to read from self using
-            row-major order (C-style), and ``F`` means to read from self
-            using column-major order (Fortran-style).
+        :param order: ``C`` means to read from self using row-major order (C-style), and
+            ``F`` means to read from self using column-major order (Fortran-style).
         :return: A copy of the matrix with same data, with a new number of rows/cols
 
         One shape dimension in newshape can be -1; in this case, the value
@@ -766,10 +761,8 @@ def reshape(self, *newshape, **order):
             matrix.reshape(4, 2) == [[0, 1], [2, 3], [4, 5], [6, 7]]
             matrix.reshape(-1, 2) == [[0, 1], [2, 3], [4, 5], [6, 7]]
             matrix.reshape(4, -1) == [[0, 1], [2, 3], [4, 5], [6, 7]]
+
         '''
-        # python2 does not support named arguments after *args, so we use
-        # **kwargs for 'order' and set the default here.
-        order = order.get('order', 'C')
         count = self.rows * self.columns
         if isinstance(newshape, int):
             if newshape == -1:

pyrtl/wire.py

@@ -394,8 +394,6 @@ def __bool__(self):
                          'something that calls "__eq__", such as when you test if a '
                          'WireVector is "in" something')
 
-    __nonzero__ = __bool__  # for Python 2 and 3 compatibility
-
     def __and__(self, other: WireVectorLike) -> WireVector:
         """Returns the result of bitwise ANDing ``self`` and ``other``.
 
@@ -1305,8 +1303,6 @@ def __bool__(self):
                              'something that calls "__eq__", such as when you test if a '
                              'Register.next is "in" something')
 
-        __nonzero__ = __bool__  # for Python 2 and 3 compatibility
-
     def __init__(self, bitwidth: int, name: str = '', reset_value: int = None,
                  block: Block = None):
         """Construct a register.