Sourcery refactored master branch #1

sourcery-ai · 2023-06-28T12:56:42Z

Branch master 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 master branch, then run:

git fetch origin sourcery/master
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-28T12:56:45Z

arithmetic_analysis/gaussian_elimination.py

-    x = retroactive_resolution(
+    return retroactive_resolution(
        augmented_mat[:, 0:columns], augmented_mat[:, columns : columns + 1]
    )

-    return x


Function gaussian_elimination refactored with the following changes:

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

sourcery-ai · 2023-06-28T12:56:45Z

arithmetic_analysis/newton_forward_interpolation.py

-    y = []
-    for i in range(n):
-        y.append([])
+    y = [[] for _ in range(n)]


Function main refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

Replace unused for index with underscore (for-index-underscore)

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

sourcery-ai · 2023-06-28T12:56:45Z

arithmetic_analysis/secant_method.py

-    for i in range(0, repeats):
+    for _ in range(0, repeats):


Function SecantMethod refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2023-06-28T12:56:45Z

backtracking/all_permutations.py

-    create_state_space_tree(sequence, [], 0, [0 for i in range(len(sequence))])
+    create_state_space_tree(sequence, [], 0, [0 for _ in range(len(sequence))])


Function generate_all_permutations refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2023-06-28T12:56:46Z

backtracking/n_queens.py

-    for i, j in zip(range(row, -1, -1), range(column, len(board))):
-        if board[i][j] == 1:
-            return False
-    return True
+    return all(
+        board[i][j] != 1
+        for i, j in zip(range(row, -1, -1), range(column, len(board)))
+    )


Function isSafe refactored with the following changes:

Use any() instead of for loop (use-any)

Invert any/all to simplify comparisons (invert-any-all)

sourcery-ai · 2023-06-28T12:56:48Z

ciphers/base64_cipher.py

-    i = 0
-    while i < len(s):
+    for i in range(0, len(s), 3):


Function encode_base64 refactored with the following changes:

Replace while with for (while-to-for)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

sourcery-ai · 2023-06-28T12:56:48Z

ciphers/base64_cipher.py

-        else:
-            if i == "=":
-                c += "="
+        elif i == "=":
+            c += "="

    p = ""
    if c == "=":
        p = "A"
-    else:
-        if c == "==":
-            p = "AA"
+    elif c == "==":
+        p = "AA"

    r = b""
    s = s + p

-    i = 0
-    while i < len(s):
+    for i in range(0, len(s), 4):


Function decode_base64 refactored with the following changes:

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

Simplify conditional into switch-like form [×4] (switch)

Replace while with for (while-to-for)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

sourcery-ai · 2023-06-28T12:56:48Z

ciphers/brute_force_caesar_cipher.py

-                num = num - key
+                num -= key
                if num < 0:
                    num = num + len(LETTERS)
                translated = translated + LETTERS[num]
            else:
                translated = translated + symbol
-        print("Decryption using Key #%s: %s" % (key, translated))
+        print(f"Decryption using Key #{key}: {translated}")


Function decrypt refactored with the following changes:

Replace assignment with augmented assignment (aug-assign)

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2023-06-28T12:56:49Z

ciphers/caesar_cipher.py

-    key = 1
    result = ""
-    while key <= 94:
+    for key in range(1, 95):


Function brute_force refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Replace while with for (while-to-for)

sourcery-ai · 2023-06-28T12:56:49Z

ciphers/elgamal_key_generator.py

-    if os.path.exists("%s_pubkey.txt" % name) or os.path.exists(
-        "%s_privkey.txt" % name
+    if os.path.exists(f"{name}_pubkey.txt") or os.path.exists(
+        f"{name}_privkey.txt"


Function makeKeyFiles refactored with the following changes:

Replace interpolated string formatting with f-string [×5] (replace-interpolation-with-fstring)

sourcery-ai · 2023-06-28T12:56:53Z

ciphers/hill_cipher.py

-    if a == 0:
-        return b
-    return gcd(b % a, a)
+    return b if a == 0 else gcd(b % a, a)


Function gcd refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-06-28T12:56:53Z

ciphers/hill_cipher.py

-        det_inv = None
-        for i in range(len(self.key_string)):
-            if (det * i) % len(self.key_string) == 1:
-                det_inv = i
-                break
-
+        det_inv = next(
+            (
+                i
+                for i in range(len(self.key_string))
+                if (det * i) % len(self.key_string) == 1
+            ),
+            None,
+        )


Function HillCipher.makeDecryptKey refactored with the following changes:

Use the built-in function next instead of a for-loop (use-next)

sourcery-ai · 2023-06-28T12:56:53Z

ciphers/hill_cipher.py

-    for i in range(N):
+    for _ in range(N):


Function main refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2023-06-28T12:56:54Z

ciphers/mixed_keyword_cypher.py

-    dic = dict()
+    dic = {}


Function mixed_keyword refactored with the following changes:

Replace dict() with {} [×2] (dict-literal)

Simplify division expressions (simplify-division)

Replace unused for index with underscore [×2] (for-index-underscore)

Use str.join() instead of for loop (use-join)

Simplify logical expression using De Morgan identities [×2] (de-morgan)

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

sourcery-ai · 2023-06-28T12:56:54Z

ciphers/morse_code_implementation.py

-    cipher = ""
-    for letter in message:
-        if letter != " ":
-
-            cipher += MORSE_CODE_DICT[letter] + " "
-        else:
-
-            cipher += " "
-
-    return cipher
+    return "".join(
+        f"{MORSE_CODE_DICT[letter]} " if letter != " " else " "
+        for letter in message
+    )


Function encrypt refactored with the following changes:

Use str.join() instead of for loop (use-join)

Replace if statement with if expression (assign-if-exp)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

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

sourcery-ai · 2023-06-28T12:56:56Z

ciphers/shuffled_shift_cipher.py

-        password = [random.choice(choices) for i in range(random.randint(10, 20))]
-        return password
+        return [random.choice(choices) for _ in range(random.randint(10, 20))]


Function ShuffledShiftCipher.__passcode_creator refactored with the following changes:

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

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2023-06-28T12:56:56Z

ciphers/simple_substitution_cipher.py

-    keyList = list(key)
    lettersList = list(LETTERS)
-    keyList.sort()
+    keyList = sorted(key)


Function checkValidKey refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Remove an unnecessary list construction call prior to sorting (skip-sorted-list-construction)

sourcery-ai · 2023-06-28T12:56:57Z

ciphers/trafid_cipher.py

-    tmp = []
-
-    for character in messagePart:
-        tmp.append(character2Number[character])
-
+    tmp = [character2Number[character] for character in messagePart]


Function __encryptPart refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2023-06-28T12:56:57Z

ciphers/trafid_cipher.py

-    decrypted = ""
-
    for i in range(0, len(message) + 1, period):
        a, b, c = __decryptPart(message[i : i + period], character2Number)

-        for j in range(0, len(a)):
-            decrypted_numeric.append(a[j] + b[j] + c[j])
-
-    for each in decrypted_numeric:
-        decrypted += number2Character[each]
-
-    return decrypted
+        decrypted_numeric.extend(a[j] + b[j] + c[j] for j in range(0, len(a)))
+    return "".join(number2Character[each] for each in decrypted_numeric)


Function decryptMessage refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

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

Use str.join() instead of for loop (use-join)

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

sourcery-ai · 2023-06-28T12:56:57Z

ciphers/trafid_cipher.py

-    print("Encrypted: {}\nDecrypted: {}".format(encrypted, decrypted))
+    print(f"Encrypted: {encrypted}\nDecrypted: {decrypted}")


Lines 120-120 refactored with the following changes:

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

sourcery-ai · 2023-06-28T12:57:01Z

ciphers/transposition_cipher.py

-    key = int(input("Enter key [2-%s]: " % (len(message) - 1)))
+    key = int(input(f"Enter key [2-{len(message) - 1}]: "))


Function main refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-06-28T12:57:01Z

ciphers/transposition_cipher_encrypt_decrypt_file.py

-        print("File %s does not exist. Quitting..." % inputFile)
+        print(f"File {inputFile} does not exist. Quitting...")
        sys.exit()
    if os.path.exists(outputFile):
-        print("Overwrite %s? [y/n]" % outputFile)
+        print(f"Overwrite {outputFile}? [y/n]")


Function main refactored with the following changes:

Replace interpolated string formatting with f-string [×2] (replace-interpolation-with-fstring)

sourcery-ai · 2023-06-28T12:57:01Z

ciphers/xor_cipher.py

-        # This will be returned
-        ans = []
-
-        for ch in content:
-            ans.append(chr(ord(ch) ^ key))
-
-        return ans
+        return [chr(ord(ch) ^ key) for ch in content]


Function XORCipher.encrypt refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

This removes the following comments ( why? ):

# This will be returned

sourcery-ai · 2023-06-28T12:57:01Z

ciphers/xor_cipher.py

-        # This will be returned
-        ans = []
-
-        for ch in content:
-            ans.append(chr(ord(ch) ^ key))
-
-        return ans
+        return [chr(ord(ch) ^ key) for ch in content]


Function XORCipher.decrypt refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

This removes the following comments ( why? ):

# This will be returned

sourcery-ai · 2023-06-28T12:57:02Z

ciphers/xor_cipher.py

-        # This will be returned
-        ans = ""
-
-        for ch in content:
-            ans += chr(ord(ch) ^ key)
-
-        return ans
+        return "".join(chr(ord(ch) ^ key) for ch in content)


Function XORCipher.encrypt_string refactored with the following changes:

Use str.join() instead of for loop (use-join)

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

This removes the following comments ( why? ):

# This will be returned

sourcery-ai · 2023-06-28T12:57:04Z

data_structures/binary_tree/basic_binary_tree.py

-    else:
-        depth_l_tree = depth_of_tree(tree.left)
-        depth_r_tree = depth_of_tree(tree.right)
-        if depth_l_tree > depth_r_tree:
-            return 1 + depth_l_tree
-        else:
-            return 1 + depth_r_tree
+    depth_l_tree = depth_of_tree(tree.left)
+    depth_r_tree = depth_of_tree(tree.right)
+    return 1 + depth_l_tree if depth_l_tree > depth_r_tree else 1 + depth_r_tree


Function depth_of_tree refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-06-28T12:57:04Z

data_structures/binary_tree/binary_search_tree.py

-        if not self.empty():
-            # Look for the node with that label
-            node = self.getNode(label)
-            # If the node exists
-            if node is not None:
-                # If it has no children
-                if node.getLeft() is None and node.getRight() is None:
-                    self.__reassignNodes(node, None)
-                    node = None
-                # Has only right children
-                elif node.getLeft() is None and node.getRight() is not None:
-                    self.__reassignNodes(node, node.getRight())
-                # Has only left children
-                elif node.getLeft() is not None and node.getRight() is None:
-                    self.__reassignNodes(node, node.getLeft())
-                # Has two children
-                else:
-                    # Gets the max value of the left branch
-                    tmpNode = self.getMax(node.getLeft())
-                    # Deletes the tmpNode
-                    self.delete(tmpNode.getLabel())
-                    # Assigns the value to the node to delete and keesp tree structure
-                    node.setLabel(tmpNode.getLabel())
+        if self.empty():
+            return
+        # Look for the node with that label
+        node = self.getNode(label)
+        # If the node exists
+        if node is not None:
+            # If it has no children
+            if node.getLeft() is None and node.getRight() is None:
+                self.__reassignNodes(node, None)
+                node = None
+            # Has only right children
+            elif node.getLeft() is None and node.getRight() is not None:
+                self.__reassignNodes(node, node.getRight())
+            # Has only left children
+            elif node.getLeft() is not None and node.getRight() is None:
+                self.__reassignNodes(node, node.getLeft())
+            # Has two children
+            else:
+                # Gets the max value of the left branch
+                tmpNode = self.getMax(node.getLeft())
+                # Deletes the tmpNode
+                self.delete(tmpNode.getLabel())
+                # Assigns the value to the node to delete and keesp tree structure
+                node.setLabel(tmpNode.getLabel())


Function BinarySearchTree.delete refactored with the following changes:

Add guard clause (last-if-guard)

sourcery-ai · 2023-06-28T12:57:04Z

data_structures/binary_tree/binary_search_tree.py

-        if root is not None:
-            curr_node = root
-        else:
-            # We go deep on the right branch
-            curr_node = self.getRoot()
+        curr_node = root if root is not None else self.getRoot()


Function BinarySearchTree.getMax refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

This removes the following comments ( why? ):

# We go deep on the right branch

sourcery-ai · 2023-06-28T12:57:04Z

data_structures/binary_tree/binary_search_tree.py

-        if root is not None:
-            curr_node = root
-        else:
-            # We go deep on the left branch
-            curr_node = self.getRoot()
+        curr_node = root if root is not None else self.getRoot()


Function BinarySearchTree.getMin refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

This removes the following comments ( why? ):

# We go deep on the left branch

sourcery-ai · 2023-06-28T12:57:04Z

data_structures/binary_tree/binary_search_tree.py

-        if self.root is None:
-            return True
-        return False
+        return self.root is None


Function BinarySearchTree.empty refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

Simplify boolean if expression (boolean-if-exp-identity)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

'Refactored by Sourcery'

c8df5bd

sourcery-ai bot requested a review from SKAUL05 June 28, 2023 12:56

sourcery-ai bot commented Jun 28, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #1

Sourcery refactored master branch #1

sourcery-ai bot commented Jun 28, 2023

sourcery-ai bot left a comment

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

sourcery-ai bot Jun 28, 2023

		create_state_space_tree(sequence, [], 0, [0 for i in range(len(sequence))])
		create_state_space_tree(sequence, [], 0, [0 for _ in range(len(sequence))])

		print("Encrypted: {}\nDecrypted: {}".format(encrypted, decrypted))
		print(f"Encrypted: {encrypted}\nDecrypted: {decrypted}")

		key = int(input("Enter key [2-%s]: " % (len(message) - 1)))
		key = int(input(f"Enter key [2-{len(message) - 1}]: "))

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Jun 28, 2023

sourcery-ai bot left a comment

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment

sourcery-ai bot Jun 28, 2023

Choose a reason for hiding this comment