diff --git a/myhdl/Cosimulation.py b/myhdl/Cosimulation.py index 16dea46f..2ea83985 100644 --- a/myhdl/Cosimulation.py +++ b/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 diff --git a/myhdl/always_comb.py b/myhdl/always_comb.py index a22d17a4..05fde2fe 100644 --- a/myhdl/always_comb.py +++ b/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""" diff --git a/myhdl/test_always_comb.py b/myhdl/test_always_comb.py index 77eb168e..f416c81d 100644 --- a/myhdl/test_always_comb.py +++ b/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 diff --git a/myhdl/test_bin.py b/myhdl/test_bin.py index da712a64..be763079 100644 --- a/myhdl/test_bin.py +++ b/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