lib_fsm and lib_bundle are updated for path search problem

Author: shtaxxx

veriloggen/lib/bundle.py

@@ -1,10 +1,15 @@
 import os
 import sys
 import re
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import vtypes
-import module
+if sys.version_info[0] >= 3:
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    import vtypes
+    import module
+else:
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+    import veriloggen.vtypes as vtypes
+    import veriloggen.module as module
 
 class Bundle(vtypes.VeriloggenNode):
     def __init__(self, m, prefix='', postfix=''):

veriloggen/lib/fsm.py

@@ -2,8 +2,12 @@
 import sys
 import collections
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import vtypes
+if sys.version_info[0] >= 3:
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    import vtypes
+else:
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+    import veriloggen.vtypes as vtypes
 
 class FSM(vtypes.VeriloggenNode):
     """ Finite State Machine Generator """

veriloggen/vtypes.py

@@ -509,7 +509,7 @@ def type_check_condition(self, *args):
             if a is None:
                 raise ValueError("None condition must not mixed in When() statement.")
             if isinstance(a, (_Numeric, int, float, str)): continue
-            raise TypeError("Condition shuold be Numeric value.")
+            raise TypeError("Condition must be _Numeric object, not '%s'" % str(type(a)))
 
     def type_check_statement(self, *args):
         pass