import through package

myhdl/Cosimulation.py

@@ -28,9 +28,8 @@ import sys
 import os
 import exceptions
 
-from Signal import Signal
-import _simulator
-from myhdl import intbv
+from myhdl import intbv, Signal
+from myhdl import _simulator
 
 _MAXLINE = 4096
 

myhdl/always_comb.py

@@ -29,9 +29,8 @@ import inspect
 from types import FunctionType
 import compiler
 
-from util import _isgeneratorfunction
-
 from myhdl import Signal
+from myhdl.util import _isgeneratorfunction
 
 class Error(Exception):
     """always_comb Error"""

myhdl/test_always_comb.py

@@ -32,12 +32,13 @@ import unittest
 from unittest import TestCase
 import inspect
 
+from myhdl import Signal, Simulation, instances, processes, \
+                  intbv, posedge, negedge, delay, StopSimulation
+
 from always_comb import always_comb, _AlwaysComb
 from always_comb import ScopeError, ArgumentError, NrOfArgsError, \
                         SignalAsInoutError
 
-from myhdl import Signal, Simulation, instances, processes, \
-                  intbv, posedge, negedge, delay, StopSimulation
 
 QUIET=1
 

myhdl/test_bin.py

@@ -32,7 +32,8 @@ random.seed(1) # random, but deterministic
 import unittest
 from unittest import TestCase
 import sys
-from bin import bin
+
+from myhdl import bin
 
 SIZE = 100