Move UIError to output to avoid indirect dependency on UI in denoise

Signed-off-by: Stefan Marr <[email protected]>

rebench/configurator.py

@@ -28,8 +28,9 @@
 from .model.exp_run_details import ExpRunDetails
 from .model.reporting import Reporting
 from .model.executor import Executor
+from .output import UIError
 from .rebenchdb import ReBenchDB
-from .ui import UIError, escape_braces
+from .ui import escape_braces
 
 # Disable most logging for pykwalify
 logging.getLogger('pykwalify').setLevel(logging.CRITICAL)

rebench/denoise.py

@@ -7,8 +7,7 @@
 from math import log, floor
 from multiprocessing import Pool
 
-from .ui import UIError
-from .output import output_as_str
+from .output import output_as_str, UIError
 from .subprocess_kill import kill_process
 
 try:

rebench/model/data_point.py

@@ -17,7 +17,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
-from ..ui import UIError
+from ..output import UIError
 
 
 class DataPoint(object):

rebench/model/run_id.py

@@ -23,8 +23,8 @@
 
 from .benchmark import Benchmark
 from .termination_check import TerminationCheck
+from ..output import UIError
 from ..statistics import StatisticProperties, SampleCounter
-from ..ui import UIError
 
 
 class RunId(object):

rebench/output.py

@@ -3,3 +3,22 @@ def output_as_str(string_like):
         return string_like.decode('utf-8')
     else:
         return string_like
+
+
+class UIError(Exception):
+
+    def __init__(self, message, exception):
+        super(UIError, self).__init__()
+        self._message = message
+        self._exception = exception
+
+    @property
+    def message(self):
+        return self._message
+
+    @property
+    def source_exception(self):
+        return self._exception
+
+    def __str__(self):
+        return self._message

rebench/persistence.py

@@ -31,8 +31,8 @@
 from .model.measurement import Measurement
 from .model.profile_data import ProfileData
 from .model.run_id      import RunId
+from .output            import UIError
 from .rebenchdb         import get_current_time
-from .ui                import UIError
 
 _START_TIME_LINE = "# Execution Start: "
 

rebench/rebench.py

@@ -41,7 +41,8 @@
 from .reporter       import CliReporter
 from .configurator   import Configurator, load_config
 from .configuration_error import ConfigurationError
-from .ui import UIError, UI
+from .output import UIError
+from .ui import UI
 
 
 class ReBench(object):

rebench/rebenchdb.py

@@ -5,7 +5,7 @@
 from http.client import HTTPException
 from urllib.request import urlopen, Request as HttpRequest
 
-from .ui import UIError
+from .output import UIError
 
 
 def get_current_time():

rebench/tests/configurator_test.py

@@ -21,7 +21,7 @@
 
 from ..configurator     import Configurator, load_config, validate_gauge_adapters
 from ..persistence      import DataStore
-from ..ui               import UIError
+from ..output           import UIError
 from .rebench_test_case import ReBenchTestCase
 
 

rebench/tests/executor_test.py

@@ -26,8 +26,8 @@
 from ..executor          import Executor, BatchScheduler, RandomScheduler, RoundRobinScheduler
 from ..configurator      import Configurator, load_config
 from ..model.measurement import Measurement
+from ..output            import UIError
 from ..persistence       import DataStore
-from ..ui import UIError
 from ..reporter          import Reporter
 
 

rebench/tests/ui_test.py

@@ -2,7 +2,8 @@
 from yaml import YAMLError
 
 from ..configurator import load_config
-from ..ui import UI, UIError, escape_braces
+from ..output import UIError
+from ..ui import UI, escape_braces
 
 from .rebench_test_case import ReBenchTestCase
 

rebench/ui.py

@@ -169,25 +169,6 @@ def debug_error_info(self, text, run_id=None, cmd=None, cwd=None, **kw):
             self._output(text, 'red', faint=True, **kw)
 
 
-class UIError(Exception):
-
-    def __init__(self, message, exception):
-        super(UIError, self).__init__()
-        self._message = message
-        self._exception = exception
-
-    @property
-    def message(self):
-        return self._message
-
-    @property
-    def source_exception(self):
-        return self._exception
-
-    def __str__(self):
-        return self._message
-
-
 class TestDummyUI(object):
 
     def init(self, _verbose, _debug):