Merge branch 'jck-py3-core'

Author: Jan Decaluwe

myhdl/_Signal.py

@@ -33,10 +33,12 @@
 from copy import copy, deepcopy
 import operator
 
+from myhdl._compat import integer_types, long
 from myhdl import _simulator as sim
 from myhdl._simulator import _signals, _siglist, _futureEvents, now
 from myhdl._intbv import intbv
 from myhdl._bin import bin
+
 # from myhdl._enum import EnumItemType
 
 _schedule = _futureEvents.append
@@ -136,8 +138,8 @@ def __init__(self, val=None):
             self._setNextVal = self._setNextBool
             self._printVcd = self._printVcdBit
             self._nrbits = 1
-        elif isinstance(val, (int, long)):
-            self._type = (int, long)
+        elif isinstance(val, integer_types):
+            self._type = integer_types
             self._setNextVal = self._setNextInt
         elif isinstance(val, intbv):
             self._type = intbv
@@ -191,7 +193,7 @@ def _update(self):
                 self._val = None
             elif isinstance(val, intbv):
                 self._val._val = next._val
-            elif isinstance(val, (int, long, EnumItemType)):
+            elif isinstance(val, (integer_types, EnumItemType)):
                 self._val = next
             else:
                 self._val = deepcopy(next)
@@ -273,14 +275,14 @@ def _setNextBool(self, val):
     def _setNextInt(self, val):
         if isinstance(val, intbv):
             val = val._val
-        elif not isinstance(val, (int, long)):
+        elif not isinstance(val, (integer_types, intbv)):
             raise TypeError("Expected int or intbv, got %s" % type(val))
         self._next = val
 
     def _setNextIntbv(self, val):
         if isinstance(val, intbv):
             val = val._val
-        elif not isinstance(val, (int, long)):
+        elif not isinstance(val, integer_types):
             raise TypeError("Expected int or intbv, got %s" % type(val))
         self._next._val = val
         self._next._handleBounds()
@@ -321,11 +323,10 @@ def __hash__(self):
         raise TypeError("Signals are unhashable")
 
 
-    def __nonzero__(self):
-        if self._val:
-            return 1
-        else:
-            return 0
+    def __bool__(self):
+        return bool(self._val)
+
+    __nonzero__ = __bool__
 
     # length
     def __len__(self):
@@ -363,21 +364,13 @@ def __mul__(self, other):
     def __rmul__(self, other):
         return other * self._val
 
-    def __div__(self, other):
+    def __truediv__(self, other):
         if isinstance(other, _Signal):
             return self._val / other._val
         else:
             return self._val / other
-    def __rdiv__(self, other):
-        return other / self._val
-    
-    def __truediv__(self, other):
-        if isinstance(other, _Signal):
-            return operator.truediv(self._val, other._val)
-        else:
-            return operator.truediv(self._val, other)
     def __rtruediv__(self, other):
-        return operator.truediv(other, self._val)
+        return other / self._val
 
     def __floordiv__(self, other):
         if isinstance(other, _Signal):
@@ -514,8 +507,10 @@ def _toVerilog(self):
     def _augm(self):
         raise TypeError("Signal object doesn't support augmented assignment")
 
-    __iadd__ = __isub__ = __idiv__ = __imul__ = __ipow__ = __imod__ = _augm
+    __iadd__ = __isub__ = __imul__ = __ipow__ = __imod__ = _augm
     __ior__ = __iand__ = __ixor__ = __irshift__ = __ilshift__ = _augm
+    __itruediv__ = __ifloordiv__ = _augm
+
 
     # index and slice assignment not supported
     def __setitem__(self, key, val):

myhdl/_Simulation.py

@@ -24,6 +24,7 @@
 
 import sys
 import os
+from operator import itemgetter
 from warnings import warn
 from types import GeneratorType
 
@@ -157,7 +158,7 @@ def run(self, duration=None, quiet=0):
                     if t == maxTime:
                         raise _SuspendSimulation(
                             "Simulated %s timesteps" % duration)
-                    _futureEvents.sort()
+                    _futureEvents.sort(key=itemgetter(0))
                     t = _simulator._time = _futureEvents[0][0]
                     if tracing:
                         print("#%s" % t, file=tracefile)

myhdl/_Waiter.py

@@ -67,7 +67,7 @@ def next(self, waiters, actives, exc):
             clone = _Waiter(self.generator, self.caller)
 
         try:
-            clause = self.generator.next()
+            clause = next(self.generator)
         except StopIteration:
             if self.caller:
                 waiters.append(self.caller)
@@ -126,7 +126,7 @@ def __init__(self, generator):
         self.generator = generator
 
     def next(self, waiters, actives, exc):
-        clause = self.generator.next()
+        clause = next(self.generator)
         schedule((_simulator._time + clause._time, self))
 
 
@@ -139,7 +139,7 @@ def __init__(self, generator):
         self.hasRun = 0
 
     def next(self, waiters, actives, exc):
-        clause = self.generator.next()
+        clause = next(self.generator)
         clause.append(self)
 
 
@@ -154,7 +154,7 @@ def __init__(self, generator):
     def next(self, waiters, actives, exc):
         if self.hasRun:
             raise StopIteration
-        clauses = self.generator.next()
+        clauses = next(self.generator)
         self.hasRun = 1
         clone = _EdgeTupleWaiter(self.generator)
         for clause in clauses:
@@ -171,7 +171,7 @@ def __init__(self, generator):
         self.hasRun = 0
 
     def next(self, waiters, actives, exc):
-        clause = self.generator.next()
+        clause = next(self.generator)
         clause._eventWaiters.append(self)
 
 
@@ -186,7 +186,7 @@ def __init__(self, generator):
     def next(self, waiters, actives, exc):
         if self.hasRun:
             raise StopIteration
-        clauses = self.generator.next()
+        clauses = next(self.generator)
         self.hasRun = 1
         clone = _SignalTupleWaiter(self.generator)
         for clause in clauses:

myhdl/_bin.py

@@ -20,7 +20,7 @@
 """ module with the bin function.
 
 """
-
+from myhdl._compat import long
 
 
 def _int2bitstring(num):

myhdl/_compat.py

@@ -0,0 +1,22 @@
+import sys
+import types
+
+PY2 = sys.version_info[0] == 2
+
+
+if not PY2:
+    string_types = (str,)
+    integer_types = (int,)
+    long = int
+    class_types = (type,)
+
+    from io import StringIO
+    import builtins
+else:
+    string_types = (str, unicode)
+    integer_types = (int, long)
+    long = long
+    class_types = (type, types.ClassType)
+
+    from cStringIO import StringIO
+    import __builtin__ as builtins

myhdl/_concat.py

@@ -22,15 +22,19 @@
 """
 from __future__ import absolute_import
 
+from myhdl._compat import integer_types
 from myhdl._intbv import intbv
 from myhdl._Signal import _Signal
+from myhdl._compat import long
+
+
 
 def concat(base, *args):
 
     if isinstance(base, intbv):
         basewidth = base._nrbits
         val = base._val
-    elif isinstance(base, (int, long)):
+    elif isinstance(base, integer_types):
         if isinstance(base, bool):
             basewidth = 1
         else:
@@ -72,7 +76,7 @@ def concat(base, *args):
         if not w:
             raise TypeError("concat: arg on pos %d should have length" % (i+1))
         width += w
-        val = val << w | v & (1L << w)-1
+        val = val << w | v & (long(1) << w)-1
 
     if basewidth:
         return intbv(val, _nrbits=basewidth + width)

myhdl/_delay.py

@@ -18,7 +18,9 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 """ Module that provides the delay class."""
+from __future__ import absolute_import
 
+from myhdl._compat import integer_types
 
 _errmsg = "arg of delay constructor should be a natural integeer"
 
@@ -33,6 +35,6 @@ def __init__(self, val):
         val -- a natural integer representing the desired delay
 
         """
-        if not isinstance(val, (int, long)) or val < 0:
+        if not isinstance(val, integer_types) or val < 0:
             raise TypeError(_errmsg)
         self._time = val

myhdl/_enum.py

@@ -23,10 +23,9 @@
 from __future__ import absolute_import
 
 
-from types import StringType
-
 from myhdl._bin import bin
 from myhdl._Signal import _Signal
+from myhdl._compat import string_types
 
 class EnumType(object):
     def __init__(self):
@@ -53,9 +52,9 @@ def enum(*names, **kwargs):
     codedict = {}
     i = 0
     for name in names:
-        if not isinstance(name, StringType):
+        if not isinstance(name, string_types):
             raise TypeError()
-        if codedict.has_key(name):
+        if name in codedict:
             raise ValueError("enum literals should be unique")
         if encoding == "one_hot":
             code = bin(1<<i, nrbits)