From ddb08e8ecbe48cb333e1151ba18793faad7988e8 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson <oscar.gustafsson@gmail.com> Date: Wed, 1 Feb 2023 09:49:45 +0100 Subject: [PATCH] Remove a few abbreviations --- b_asic/port.py | 5 +++-- b_asic/schedule.py | 2 +- b_asic/scheduler_gui/compile.py | 10 ++++++++-- b_asic/scheduler_gui/logger.py | 7 ++----- b_asic/scheduler_gui/main_window.py | 2 +- b_asic/signal_flow_graph.py | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/b_asic/port.py b/b_asic/port.py index 33443860..9b60a6fc 100644 --- a/b_asic/port.py +++ b/b_asic/port.py @@ -68,8 +68,9 @@ class Port(ABC): @abstractmethod def add_signal(self, signal: Signal) -> None: """ - Connect this port to the entered signal. If the entered signal isn't connected to - this port then connect the entered signal to the port as well. + Connect this port to the entered signal. If the entered signal is not + connected to this port then connect the entered signal to the port as + well. """ raise NotImplementedError diff --git a/b_asic/schedule.py b/b_asic/schedule.py index f7b3f498..17b22d96 100644 --- a/b_asic/schedule.py +++ b/b_asic/schedule.py @@ -369,7 +369,7 @@ class Schedule: for outport in outports: op = outport.operation if op.graph_id not in self._start_times: - # Schedule the operation if it doesn't have a start time yet. + # Schedule the operation if it does not have a start time yet. op_start_time = 0 for inport in op.inputs: assert ( diff --git a/b_asic/scheduler_gui/compile.py b/b_asic/scheduler_gui/compile.py index 473526f0..d8cfe326 100644 --- a/b_asic/scheduler_gui/compile.py +++ b/b_asic/scheduler_gui/compile.py @@ -70,7 +70,10 @@ def compile_rc(*filenames: str) -> None: if rcc is None: rcc = shutil.which("pyrcc5") arguments = f"-o {outfile} {filename}" - assert rcc, "PySide2 compiler failed, can't find rcc" + assert rcc, ( + "Qt Resource compiler failed, cannot find pyside2-rcc, rcc, or" + " pyrcc5" + ) os_ = sys.platform if os_.startswith("linux"): # Linux @@ -141,7 +144,10 @@ def compile_ui(*filenames: str) -> None: if uic_ is None: uic_ = shutil.which("pyuic5") arguments = f"-o {outfile} {filename}" - assert uic_, "PySide2 compiler failed, can't find uic" + assert uic_, ( + "Qt User Interface Compiler failed, cannot find pyside2-uic," + " uic, or pyuic5" + ) os_ = sys.platform if os_.startswith("linux"): # Linux diff --git a/b_asic/scheduler_gui/logger.py b/b_asic/scheduler_gui/logger.py index ee5ffa49..c85792a4 100644 --- a/b_asic/scheduler_gui/logger.py +++ b/b_asic/scheduler_gui/logger.py @@ -39,7 +39,7 @@ Usage: - 40 The last `exception(str)` is used to capture exceptions output, that normally -won't be captured. +will not be captured. See https://docs.python.org/3/howto/logging.html for more information. Log Uncaught Exceptions: @@ -50,12 +50,9 @@ import logging import logging.handlers import os import sys -import traceback from logging import Logger from types import TracebackType -from typing import Optional, Type, Union - -from qtpy import QtCore, QtWidgets +from typing import Type, Union def getLogger( diff --git a/b_asic/scheduler_gui/main_window.py b/b_asic/scheduler_gui/main_window.py index dc5b086b..936d4ebc 100644 --- a/b_asic/scheduler_gui/main_window.py +++ b/b_asic/scheduler_gui/main_window.py @@ -404,7 +404,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): buttons: list[QAbstractButton] = box.buttons() buttons[0].setText(self.tr("&Exit")) buttons[1].setText(self.tr("&Cancel")) - checkbox = QCheckBox(self.tr("Don't ask again")) + checkbox = QCheckBox(self.tr("Do not ask again")) box.setCheckBox(checkbox) ret = box.exec_() diff --git a/b_asic/signal_flow_graph.py b/b_asic/signal_flow_graph.py index dc867e09..aae96f37 100644 --- a/b_asic/signal_flow_graph.py +++ b/b_asic/signal_flow_graph.py @@ -971,7 +971,7 @@ class SFG(AbstractOperation): for outport in curr_iter_ports: for signal in outport.signals: new_inport = signal.destination - # Don't traverse over delays. + # Do not traverse over delays. if new_inport is not None and not isinstance( new_inport.operation, Delay ): -- GitLab