Upgrade with pyupgrade

- More concise super()
- No more future, six imports
- Implicit object inheritance
- f-strings

conftest.py

@@ -51,7 +51,7 @@ def screenshots(qapp, qtbot, request):
     if not os.path.isdir(ss_dir):
         os.mkdir(ss_dir)
 
-    class SSSaver(object):
+    class SSSaver:
         """Returnable object to save test-context screenshots"""
 
         def __init__(self, root_path):
@@ -63,7 +63,7 @@ def _filename(self):
             test_file_name = os.path.splitext(
                 os.path.basename(request.node.parent.name)
             )[0]
-            return "{}__{}_{}.png".format(test_file_name, request.node.name, self.count)
+            return f"{test_file_name}__{request.node.name}_{self.count}.png"
 
         def saveWidget(self, widget, filename=None):
             """Save a widget screenshot."""

dui_app/write_setpath.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import logging
 import sys
 

setup.py

@@ -47,7 +47,7 @@ def run(self):
             directory, ui_filename = os.path.split(infile)
             py_filename = ui_filename.replace(".ui", ".py")
             outfile = os.path.join(directory, "ui_" + py_filename)
-            print("Compiling: {0} -> {1}".format(infile, outfile))
+            print(f"Compiling: {infile} -> {outfile}")
             self._compile_ui(infile, outfile)
 
 

src/dui/__init__.py

@@ -8,7 +8,6 @@
 copyright (c) CCP4 - DLS
 """
 
-from __future__ import absolute_import, division, print_function
 
 from ._version import __version__  # noqa F401
 

src/dui/cli_utils.py

@@ -7,15 +7,13 @@
 
 copyright (c) CCP4 - DLS
 """
-from __future__ import absolute_import, division, print_function
 
 import json
 import logging
 import os
 import subprocess
 
 import libtbx.phil
-from six.moves import range
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -35,7 +33,7 @@
 logger = logging.getLogger(__name__)
 
 
-class SysArgvData(object):
+class SysArgvData:
     """
     Some data related to how the GUI gets launched from CLI
     """
@@ -101,15 +99,15 @@ def get_next_step(node_obj):
     return None
 
 
-class ScopeData(object):
+class ScopeData:
     """
     class conceived to store only data related to the scope Phil object
     """
 
     pass
 
 
-class tree_2_lineal(object):
+class tree_2_lineal:
 
     """
     Recursively navigates the Phil objects in a way that the final
@@ -540,7 +538,7 @@ def generate_report(node_obj):
     return rep_out
 
 
-class DialsCommand(object):
+class DialsCommand:
     def __init__(self):
         logger.debug("creating new DialsCommand (obj)")
         self.full_cmd_lst = [None]
@@ -664,7 +662,7 @@ def print_list(lst, curr):
         logger.info(stp_str)
 
 
-class TreeShow(object):
+class TreeShow:
     def __init__(self):
         self.ind_spc = "      "
         self.ind_lin = "------"
@@ -696,7 +694,7 @@ def add_tree(self, step=None, indent=None):
         else:
             stp_prn = " N "
 
-        str_lin_num = "{0:3}".format(int(step.lin_num))
+        str_lin_num = "{:3}".format(int(step.lin_num))
 
         stp_prn += str_lin_num + self.ind_spc * indent + r"   \___"
         stp_prn += str(step.ll_command_lst[0][0])

src/dui/custom_widgets.py

@@ -20,7 +20,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from __future__ import absolute_import, division, print_function
 
 import logging
 import os
@@ -34,7 +33,6 @@
 from dials.command_line.refine_bravais_settings import (
     phil_scope as phil_scope_r_b_settings,
 )
-from six.moves import range
 
 from dui.cli_utils import sys_arg
 from dui.gui_utils import get_import_run_string, get_main_path
@@ -99,17 +97,17 @@ class BeamCentrPage(QWidget):
     b_centr_set = Signal()
 
     def __init__(self, parent=None):
-        super(BeamCentrPage, self).__init__(parent=None)
+        super().__init__(parent=None)
 
         main_v_box = QVBoxLayout()
 
         label_font = QFont()
         sys_font_point_size = label_font.pointSize()
         label_font.setPointSize(sys_font_point_size + 2)
-        step_label = QLabel(str("Modify Geometry"))
+        step_label = QLabel("Modify Geometry")
         step_label.setFont(label_font)
 
-        self.data_bc_label = QLabel(str("empty Data ... for now"))
+        self.data_bc_label = QLabel("empty Data ... for now")
 
         main_v_box.addWidget(step_label)
         main_v_box.addStretch()
@@ -162,11 +160,11 @@ def set_par(self, lst_par):
 
 class InnerMask(QWidget):
     def __init__(self, parent=None):
-        super(InnerMask, self).__init__(parent=None)
+        super().__init__(parent=None)
 
         self.outher_box = QVBoxLayout()
         self.list_widg = QVBoxLayout()
-        self.list_widg.addWidget(QLabel(str("empty List ... for now")))
+        self.list_widg.addWidget(QLabel("empty List ... for now"))
         self.outher_box.addStretch()
         self.outher_box.addLayout(self.list_widg)
         self.outher_box.addStretch()
@@ -198,14 +196,14 @@ class MaskPage(QWidget):
     """
 
     def __init__(self, parent=None):
-        super(MaskPage, self).__init__(parent=None)
+        super().__init__(parent=None)
 
         main_v_box = QVBoxLayout()
 
         label_font = QFont()
         sys_font_point_size = label_font.pointSize()
         label_font.setPointSize(sys_font_point_size + 2)
-        step_label = QLabel(str("Apply Mask"))
+        step_label = QLabel("Apply Mask")
         step_label.setFont(label_font)
 
         self.my_scroll_area = QScrollArea()
@@ -259,17 +257,17 @@ class ExportPage(QWidget):
     """
 
     def __init__(self, parent=None):
-        super(ExportPage, self).__init__(parent=None)
+        super().__init__(parent=None)
 
         main_v_box = QVBoxLayout()
 
         label_font = QFont()
         sys_font_point_size = label_font.pointSize()
         label_font.setPointSize(sys_font_point_size + 2)
-        step_label = QLabel(str("Export"))
+        step_label = QLabel("Export")
         step_label.setFont(label_font)
 
-        out_file_label = QLabel(str("mtz output name:"))
+        out_file_label = QLabel("mtz output name:")
 
         self.simple_lin = QLineEdit(self)
         self.simple_lin.textChanged.connect(self.update_command)
@@ -278,7 +276,7 @@ def __init__(self, parent=None):
         self.check_scale.setChecked(False)
         self.check_scale.stateChanged.connect(self.update_command)
 
-        self.warning_label = QLabel(str(" "))
+        self.warning_label = QLabel(" ")
         self.warning_label.setWordWrap(True)
 
         main_v_box.addWidget(step_label)
@@ -372,14 +370,14 @@ class ImportPage(QWidget):
     """
 
     def __init__(self, parent=None):
-        super(ImportPage, self).__init__(parent=None)
+        super().__init__(parent=None)
 
         main_v_box = QVBoxLayout()
 
         label_font = QFont()
         sys_font_point_size = label_font.pointSize()
         label_font.setPointSize(sys_font_point_size + 2)
-        step_label = QLabel(str("Import"))
+        step_label = QLabel("Import")
         step_label.setFont(label_font)
 
         self.simple_lin = QLineEdit(self)
@@ -562,7 +560,7 @@ def activate_me(self, cur_nod=None):
 
 class ParamAdvancedWidget(QWidget):
     def __init__(self, phl_obj=None, parent=None):
-        super(ParamAdvancedWidget, self).__init__()
+        super().__init__()
 
         self.scrollable_widget = PhilWidget(phl_obj, parent=self)
         scrollArea = QScrollArea()
@@ -644,7 +642,7 @@ class ParamMainWidget(QWidget):
     update_command_lst_low_level = Signal(list)
 
     def __init__(self, phl_obj=None, simp_widg=None, parent=None, upper_label=None):
-        super(ParamMainWidget, self).__init__()
+        super().__init__()
 
         self.command_lst = [[None]]
         self.lst_pair = []
@@ -889,7 +887,7 @@ class ParamWidget(QWidget):
     update_command_lst_medium_level = Signal(list)
 
     def __init__(self, label_str):
-        super(ParamWidget, self).__init__()
+        super().__init__()
         self.my_label = label_str
 
         inner_widgs = {

src/dui/dynamic_reindex_gui.py

@@ -21,14 +21,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-from __future__ import absolute_import, division, print_function
-
 import json
 import logging
 import os
 import sys
 
-from six.moves import range
 
 from dui.cli_utils import sys_arg
 from dui.qt import (
@@ -58,7 +55,7 @@
 
 def choice_if_decimal(num_in):
 
-    str_f = "{:6.2f}".format(num_in)
+    str_f = f"{num_in:6.2f}"
     if str_f[-3:] == ".00":
         str_out = str_f[0:-3]
 
@@ -81,11 +78,11 @@ def ops_list_from_json(json_path=None):
         for inner_key in value:
             if inner_key == "rmsd":
                 rmsd_val = value["rmsd"]
-                rmsd_str = " {:7.2}".format(rmsd_val)
+                rmsd_str = f" {rmsd_val:7.2}"
 
             elif inner_key == "min_cc":
                 min_cc_val = value["min_cc"]
-                min_cc_str = " {:7.2}".format(min_cc_val)
+                min_cc_str = f" {min_cc_val:7.2}"
 
                 if "Non" in min_cc_str:
                     min_cc_str = "    - "
@@ -97,7 +94,7 @@ def ops_list_from_json(json_path=None):
 
             elif inner_key == "max_cc":
                 max_cc_val = value["max_cc"]
-                max_cc_str = " {:7.2}".format(max_cc_val)
+                max_cc_str = f" {max_cc_val:7.2}"
 
                 if "Non" in max_cc_str:
                     max_cc_str = "    - "
@@ -115,7 +112,7 @@ def ops_list_from_json(json_path=None):
 
             elif inner_key == "max_angular_difference":
                 angular_diff_val = value["max_angular_difference"]
-                angular_diff_str = " {:7.2} ".format(angular_diff_val)
+                angular_diff_str = f" {angular_diff_val:7.2} "
 
             elif inner_key == "correlation_coefficients":
                 # corr_coeff_val = value["correlation_coefficients"]
@@ -175,7 +172,7 @@ def heather_text_from_lin(lin_num, j_path):
 
     logger.debug("my_file_path: ", my_file_path)
 
-    myfile = open(my_file_path, "r")
+    myfile = open(my_file_path)
     all_lines = myfile.readlines()
     myfile.close()
 
@@ -212,7 +209,7 @@ class ReindexTable(QTableWidget):
     opt_signal = Signal(int)
 
     def __init__(self, parent=None):
-        super(ReindexTable, self).__init__(parent)
+        super().__init__(parent)
 
         self.cellClicked.connect(self.opt_clicked)
 
@@ -348,7 +345,7 @@ def del_opts_lst(self):
 
 class MyReindexOpts(QWidget):
     def __init__(self, parent=None):
-        super(MyReindexOpts, self).__init__(parent)
+        super().__init__(parent)
         self.setWindowTitle("Reindex")
 
     def set_ref(self, in_json_path, lin_num):
@@ -407,7 +404,7 @@ def set_ref(self, in_json_path, lin_num):
 
 class MainWindow(QMainWindow):
     def __init__(self, parent=None):
-        super(MainWindow, self).__init__(parent)
+        super().__init__(parent)
 
         self.btn1 = QPushButton("Click me", self)