Skip to content

Commit 9873cb9

Browse files
committed
Fixes linting errors
1 parent c916642 commit 9873cb9

16 files changed

+91
-44
lines changed

src/ascii_dialog/col_editor.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
from PySide6.QtGui import QRegularExpressionValidator
2-
from PySide6.QtWidgets import QComboBox, QHBoxLayout, QWidget
3-
from PySide6.QtCore import Slot, Signal
4-
from sasdata.quantities.units import NamedUnit
1+
from typing import cast
2+
3+
from PySide6.QtCore import Signal, Slot
4+
from PySide6.QtWidgets import QHBoxLayout, QWidget
5+
56
from sasdata.ascii_reader_metadata import bidirectional_pairings
7+
from sasdata.quantities.units import NamedUnit
8+
69
from ascii_dialog.column_unit import ColumnUnit
7-
from typing import cast
10+
811

912
class ColEditor(QWidget):
1013
"""An editor widget which allows the user to specify the columns of the data
@@ -28,7 +31,7 @@ def __init__(self, cols: int, options: list[str]):
2831
def onColumnUpdate(self):
2932
column_changed = cast(ColumnUnit, self.sender())
3033
pairing = bidirectional_pairings.get(column_changed.currentColumn)
31-
if not pairing is None:
34+
if pairing is not None:
3235
for col_unit in self.option_widgets:
3336
# Second condition is important because otherwise, this event will keep being called, and the GUI will
3437
# go into an infinite loop.

src/ascii_dialog/column_unit.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#!/usr/bin/env python3
22

33
from PySide6.QtCore import Signal, Slot
4-
from PySide6.QtWidgets import QComboBox, QCompleter, QHBoxLayout, QSizePolicy, QWidget
54
from PySide6.QtGui import QRegularExpressionValidator
5+
from PySide6.QtWidgets import QComboBox, QHBoxLayout, QSizePolicy, QWidget
6+
67
from sasdata.dataset_types import unit_kinds
7-
from sasdata.quantities.units import symbol_lookup, NamedUnit
8+
from sasdata.default_units import defaults_or_fallback
9+
from sasdata.quantities.units import NamedUnit
810

911
from ascii_dialog.unit_selector import UnitSelector
10-
from sasdata.default_units import defaults_or_fallback
12+
1113

1214
def configure_size_policy(combo_box: QComboBox) -> None:
1315
policy = combo_box.sizePolicy()

src/ascii_dialog/dialog.py

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
1-
from PySide6.QtGui import QColor, QContextMenuEvent, QCursor, QPalette, Qt
2-
from PySide6.QtWidgets import QAbstractScrollArea, QCheckBox, QComboBox, QFileDialog, QHBoxLayout, QHeaderView, QLabel, \
3-
QMessageBox, QPushButton, QSpacerItem, QSpinBox, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget, QApplication, QDialog
1+
from os import path
2+
43
from PySide6.QtCore import QModelIndex, QPoint, Slot
5-
from ascii_dialog.selection_menu import SelectionMenu
6-
from ascii_dialog.warning_label import WarningLabel
4+
from PySide6.QtGui import QColor, QCursor, Qt
5+
from PySide6.QtWidgets import (
6+
QAbstractScrollArea,
7+
QApplication,
8+
QCheckBox,
9+
QComboBox,
10+
QDialog,
11+
QFileDialog,
12+
QHBoxLayout,
13+
QHeaderView,
14+
QLabel,
15+
QMessageBox,
16+
QPushButton,
17+
QSpacerItem,
18+
QSpinBox,
19+
QTableWidget,
20+
QTableWidgetItem,
21+
QVBoxLayout,
22+
QWidget,
23+
)
24+
25+
from sasdata.ascii_reader_metadata import AsciiReaderMetadata
26+
from sasdata.dataset_types import DatasetType, dataset_types, one_dim, sesans, two_dim
27+
from sasdata.guess import guess_column_count, guess_columns, guess_starting_position
28+
from sasdata.temp_ascii_reader import AsciiReaderParams, load_data, split_line
29+
730
from ascii_dialog.col_editor import ColEditor
31+
from ascii_dialog.constants import TABLE_MAX_ROWS
832
from ascii_dialog.row_status_widget import RowStatusWidget
9-
from sasdata.guess import guess_column_count, guess_columns, guess_starting_position
10-
from os import path
11-
from sasdata.dataset_types import DatasetType, dataset_types, one_dim, two_dim, sesans
12-
from sasdata.temp_ascii_reader import load_data, AsciiReaderParams, split_line
33+
from ascii_dialog.selection_menu import SelectionMenu
34+
from ascii_dialog.warning_label import WarningLabel
1335
from metadata_filename_gui.metadata_filename_dialog import MetadataFilenameDialog
14-
from metadata_filename_gui.metadata_tree_data import initial_metadata_dict
15-
from sasdata.ascii_reader_metadata import AsciiReaderMetadata
16-
from ascii_dialog.constants import TABLE_MAX_ROWS, NOFILE_TEXT
17-
import re
1836

1937
dataset_dictionary = dict([(dataset.name, dataset) for dataset in [one_dim, two_dim, sesans]])
2038

src/ascii_dialog/row_status_widget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
from PySide6.QtCore import Signal, Slot, Qt
3+
from PySide6.QtCore import Qt, Signal, Slot
44
from PySide6.QtWidgets import QCheckBox, QHBoxLayout, QWidget
55

66

src/ascii_dialog/selection_menu.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from PySide6.QtGui import QAction
66
from PySide6.QtWidgets import QMenu, QWidget
77

8+
89
class SelectionMenu(QMenu):
910
select_all_event = Signal()
1011
deselect_all_event = Signal()

src/ascii_dialog/unit_list_widget.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env python3
22

33
from PySide6.QtWidgets import QListWidget, QListWidgetItem
4+
45
from sasdata.quantities.units import NamedUnit
56

67

src/ascii_dialog/unit_preference_line.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
from PySide6.QtCore import Slot
44
from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QWidget
5+
56
from sasdata.quantities.units import NamedUnit, UnitGroup
67

78
from ascii_dialog.unit_selector import UnitSelector
89

10+
911
class UnitPreferenceLine(QWidget):
1012
def __init__(self, column_name: str, initial_unit: NamedUnit, group: UnitGroup):
1113
super().__init__()

src/ascii_dialog/unit_preferences.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
#!/usr/bin/env python3
22

3+
import random
4+
35
from PySide6.QtGui import Qt
46
from PySide6.QtWidgets import QApplication, QScrollArea, QVBoxLayout, QWidget
5-
from sasdata.quantities.units import NamedUnit
7+
68
from sasdata.dataset_types import unit_kinds
9+
from sasdata.quantities.units import NamedUnit
10+
711
from ascii_dialog.unit_preference_line import UnitPreferenceLine
8-
import random
12+
913

1014
class UnitPreferences(QWidget):
1115
def __init__(self):

src/ascii_dialog/unit_selector.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from PySide6.QtCore import Slot
22
from PySide6.QtWidgets import QApplication, QComboBox, QDialog, QLineEdit, QPushButton, QVBoxLayout
3+
34
from sasdata.quantities.units import NamedUnit, UnitGroup, unit_group_names, unit_groups
45

56
from ascii_dialog.unit_list_widget import UnitListWidget

src/ascii_dialog/warning_label.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from PySide6.QtWidgets import QLabel
2+
23
from ascii_dialog.constants import TABLE_MAX_ROWS
34

45

@@ -37,7 +38,7 @@ def updateWarning(self, missing_columns: list[str], duplicate_columns: list[str]
3738
self.setText(f'The following columns are missing: {missing_columns}')
3839
self.setFontRed()
3940
elif len(duplicate_columns) > 0:
40-
self.setText(f'There are columns which are repeated.')
41+
self.setText('There are columns which are repeated.')
4142
self.setFontRed()
4243
elif unparsable > 0:
4344
# FIXME: This error message could perhaps be a bit clearer.

0 commit comments

Comments
 (0)