Sourcery refactored main branch by sourcery-ai[bot] · Pull Request #1 · xoiopure/NodeGraphQt

sourcery-ai · 2023-06-22T10:21:44Z

Branch main refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the main branch, then run:

git fetch origin sourcery/main
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai

Due to GitHub API limits, only the first 60 comments can be shown.

sourcery-ai · 2023-06-22T10:21:46Z

NodeGraphQt/base/commands.py

    def __init__(self, node, name, value):
        QtWidgets.QUndoCommand.__init__(self)
-        self.setText('property "{}:{}"'.format(node.name(), name))
+        self.setText(f'property "{node.name()}:{name}"')


Function PropertyChangedCmd.__init__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:46Z

NodeGraphQt/base/commands.py

    def __init__(self, port):
        QtWidgets.QUndoCommand.__init__(self)
-        self.setText('lock port "{}"'.format(port.name()))
+        self.setText(f'lock port "{port.name()}"')


Function PortLockedCmd.__init__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:46Z

NodeGraphQt/base/commands.py

    def __init__(self, port):
        QtWidgets.QUndoCommand.__init__(self)
-        self.setText('unlock port "{}"'.format(port.name()))
+        self.setText(f'unlock port "{port.name()}"')


Function PortUnlockedCmd.__init__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:46Z

NodeGraphQt/base/commands.py

-            self.setText('show port {}'.format(self.port.name()))
+            self.setText(f'show port {self.port.name()}')
        else:
-            self.setText('hide port {}'.format(self.port.name()))
+            self.setText(f'hide port {self.port.name()}')


Function PortVisibleCmd.__init__ refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:47Z

NodeGraphQt/base/factory.py


-        _NodeClass = self.__nodes.get(node_type)
-        if _NodeClass:
+        if _NodeClass := self.__nodes.get(node_type):


Function NodeFactory.create_node_instance refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-06-22T10:21:48Z

NodeGraphQt/base/graph.py

-            for port in node.input_ports() + node.output_ports():
-                if port.locked():
-                    locked_ports.append('{0.node.name}: {0.name}'.format(port))
-
+            locked_ports.extend(
+                '{0.node.name}: {0.name}'.format(port)
+                for port in node.input_ports() + node.output_ports()
+                if port.locked()
+            )
            base_nodes.append(node)

        if locked_ports:
-            message = (
-                'Selected nodes cannot be extracted because the following '
-                'ports are locked:\n{}'.format('\n'.join(sorted(locked_ports)))
-            )
            if prompt_warning:
+                message = (
+                    'Selected nodes cannot be extracted because the following '
+                    'ports are locked:\n{}'.format('\n'.join(sorted(locked_ports)))
+                )
                self._viewer.message_dialog(message, 'Can\'t Extract Nodes')
            return

        if push_undo:
-            self._undo_stack.beginMacro(
-                'extracted "{}" node(s)'.format(len(nodes))
-            )
+            self._undo_stack.beginMacro(f'extracted "{len(nodes)}" node(s)')


Function NodeGraph.extract_nodes refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

Move assignments closer to their usage (move-assign)

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:49Z

NodeGraphQt/base/graph.py

-        nodes = []
-        for item in self._viewer.selected_nodes():
-            node = self._model.nodes[item.id]
-            nodes.append(node)
-        return nodes
+        return [self._model.nodes[item.id] for item in self._viewer.selected_nodes()]


Function NodeGraph.selected_nodes refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

Inline variable that is only used once (inline-variable)

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-06-22T10:21:49Z

NodeGraphQt/base/graph.py

-                new_name = '{} {}'.format(name, x)
+                new_name = f'{name} {x}'
                if new_name not in node_names:
                    return new_name

-        version = search.group(1)
+        version = search[1]
        name = name[:len(version) * -1].strip()
        for x in range(1, len(node_names) + 2):
-            new_name = '{} {}'.format(name, x)
+            new_name = f'{name} {x}'


Function NodeGraph.get_unique_name refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2023-06-22T10:21:49Z

NodeGraphQt/base/graph.py

-            nodes_data.update(node_dict)
+            nodes_data |= node_dict


Function NodeGraph._serialize refactored with the following changes:

Merge dictionary updates via the union operator (dict-assign-update-to-union)

sourcery-ai · 2023-06-22T10:21:49Z

NodeGraphQt/base/graph.py

-            node = self._node_factory.create_node_instance(identifier)
-            if node:
+            if node := self._node_factory.create_node_instance(identifier):


Function NodeGraph._deserialize refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-06-22T10:21:53Z

NodeGraphQt/base/graph.py

-            raise IOError('file does not exist: {}'.format(file_path))
+            raise IOError(f'file does not exist: {file_path}')


Function NodeGraph.load_session refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:53Z

NodeGraphQt/base/graph.py

-            raise IOError('file does not exist: {}'.format(file_path))
+            raise IOError(f'file does not exist: {file_path}')

        try:
            with open(file_path) as data_file:
                layout_data = json.load(data_file)
        except Exception as e:
            layout_data = None
-            print('Cannot read data from file.\n{}'.format(e))
+            print(f'Cannot read data from file.\n{e}')


Function NodeGraph.import_session refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:54Z

NodeGraphQt/base/graph.py

-        serial_str = json.dumps(serial_data)
-        if serial_str:
+        if serial_str := json.dumps(serial_data):


Function NodeGraph.copy_nodes refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-06-22T10:21:54Z

NodeGraphQt/base/graph.py

-            print('ERROR: Can\'t Decode Clipboard Data:\n'
-                  '"{}"'.format(cb_text))
+            print(f"""ERROR: Can\'t Decode Clipboard Data:\n"{cb_text}\"""")


Function NodeGraph.paste_nodes refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:54Z

NodeGraphQt/base/graph.py

-            text = '{} ({}) nodes'.format(states[mode], len(nodes))
+            text = f'{states[mode]} ({len(nodes)}) nodes'


Function NodeGraph.disable_nodes refactored with the following changes:

Replace call to format with f-string [×3] (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:56Z

NodeGraphQt/base/menu.py

-        return '<{}("{}") object at {}>'.format(
-            self.__class__.__name__, self.name(), hex(id(self)))
+        return f'<{self.__class__.__name__}("{self.name()}") object at {hex(id(self))}>'


Function NodeGraphCommand.__repr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:56Z

NodeGraphQt/base/model.py

    def __repr__(self):
-        return '<{}(\'{}\') object at {}>'.format(
-            self.__class__.__name__, self.name, hex(id(self)))
+        return f"<{self.__class__.__name__}(\'{self.name}\') object at {hex(id(self))}>"


Function PortModel.__repr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:56Z

NodeGraphQt/base/model.py

-        return '<{}(\'{}\') object at {}>'.format(
-            self.__class__.__name__, self.name, self.id)
+        return f"<{self.__class__.__name__}(\'{self.name}\') object at {self.id}>"


Function NodeModel.__repr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:56Z

NodeGraphQt/base/model.py

        if name in self._custom_prop.keys():
-            raise NodePropertyError(
-                '"{}" property already exists.'.format(name))
+            raise NodePropertyError(f'"{name}" property already exists.')


Function NodeModel.add_property refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:21:56Z

NodeGraphQt/base/model.py

-            raise NodePropertyError('No property "{}"'.format(name))
+            raise NodePropertyError(f'No property "{name}"')


Function NodeModel.set_property refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:22:00Z

NodeGraphQt/base/model.py

-            attrs = self._TEMP_property_attrs.get(name)
-            if attrs:
+            if attrs := self._TEMP_property_attrs.get(name):


Function NodeModel.get_tab_name refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-06-22T10:22:00Z

NodeGraphQt/base/model.py

-        model = self._graph_model
-        if model:
+        if model := self._graph_model:


Function NodeModel.add_port_accept_connection_type refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Unwrap a constant iterable constructor (unwrap-iterable-construction)

sourcery-ai · 2023-06-22T10:22:00Z

NodeGraphQt/base/model.py

-        model = self._graph_model
-        if model:
+        if model := self._graph_model:


Function NodeModel.add_port_reject_connection_type refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Unwrap a constant iterable constructor (unwrap-iterable-construction)

sourcery-ai · 2023-06-22T10:22:01Z

NodeGraphQt/base/model.py

-            connected_ports = model.to_dict['connected_ports']
-            if connected_ports:
+            if connected_ports := model.to_dict['connected_ports']:


Function NodeModel.to_dict refactored with the following changes:

Use named expression to simplify assignment and conditional [×3] (use-named-expression)

sourcery-ai · 2023-06-22T10:22:01Z

NodeGraphQt/base/model.py

-            connection_data[accept_ptype] = set([accept_pname])
+            connection_data[accept_ptype] = {accept_pname}


Function NodeGraphModel.add_port_accept_connection_type refactored with the following changes:

Unwrap a constant iterable constructor (unwrap-iterable-construction)

sourcery-ai · 2023-06-22T10:22:03Z

NodeGraphQt/custom_widgets/nodes_palette.py

-            raise ValueError('label "{}" already in use for "{}"'
-                             .format(label, labels[label]))
+            raise ValueError(f'label "{label}" already in use for "{labels[label]}"')


Function NodesPaletteWidget.set_category_label refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:22:03Z

NodeGraphQt/custom_widgets/nodes_tree.py

-        return '<{} object at {}>'.format(
-            self.__class__.__name__, hex(id(self))
-        )
+        return f'<{self.__class__.__name__} object at {hex(id(self))}>'


Function NodesTreeWidget.__repr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:22:03Z

NodeGraphQt/custom_widgets/nodes_tree.py

-        node_ids = ['node:{}'.format(i.toolTip(0)) for i in items]
+        node_ids = [f'node:{i.toolTip(0)}' for i in items]


Function NodesTreeWidget.mimeData refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:22:03Z

NodeGraphQt/custom_widgets/nodes_tree.py

-                label = '{}'.format(category)
+                label = f'{category}'


Function NodesTreeWidget._build_tree refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-06-22T10:22:03Z

NodeGraphQt/custom_widgets/properties_bin/custom_widget_color_picker.py

-        self._button.setToolTip(
-            'rgb: {}\nhex: {}'.format(self._color[:3], hex_color)
-        )
+        self._button.setToolTip(f'rgb: {self._color[:3]}\nhex: {hex_color}')


Function PropColorPickerRGB._update_color refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

'Refactored by Sourcery'

eb389c8

sourcery-ai bot requested a review from xoiopure June 22, 2023 10:21

sourcery-ai bot commented Jun 22, 2023

View reviewed changes

		raise IOError('file does not exist: {}'.format(file_path))
		raise IOError(f'file does not exist: {file_path}')

		text = '{} ({}) nodes'.format(states[mode], len(nodes))
		text = f'{states[mode]} ({len(nodes)}) nodes'

		raise NodePropertyError('No property "{}"'.format(name))
		raise NodePropertyError(f'No property "{name}"')

		connection_data[accept_ptype] = set([accept_pname])
		connection_data[accept_ptype] = {accept_pname}

		node_ids = ['node:{}'.format(i.toolTip(0)) for i in items]
		node_ids = [f'node:{i.toolTip(0)}' for i in items]

Conversation

sourcery-ai bot commented Jun 22, 2023

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jun 22, 2023

Choose a reason for hiding this comment