Sourcery refactored master branch #4

sourcery-ai · 2024-01-08T22:06:24Z

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 · 2024-01-08T22:06:26Z

2proc_pmutex.py

-    while turn == process and interested[other] == True:
+    while turn == turn and interested[other] == True:
        k += 1
        # if (k % 10000 == 0):
        # 	print "process wait",process
        continue
-    print("entered_critical: %d ticks %d" % (process, k))
+    print("entered_critical: %d ticks %d" % (turn, k))


Function enter_region refactored with the following changes:

Use previously assigned local variable (use-assigned-variable)

sourcery-ai · 2024-01-08T22:06:27Z

CVE-2016-2017.py

-    print("recv:" + ssl_sock.recv(512))
+    print(f"recv:{ssl_sock.recv(512)}")


Lines 33-33 refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:27Z

CVE-2017-7679.py

-i = list(difflib.unified_diff(s1, s2))
-
-if len(i) > 0:
+if i := list(difflib.unified_diff(s1, s2)):


Lines 34-36 refactored with the following changes:

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

Simplify sequence length comparison (simplify-len-comparison)

sourcery-ai · 2024-01-08T22:06:27Z

TOTP_test.py

-os.system("cat %s | gpg --decrypt > %s" % (sys.argv[1], tmp))
+os.system(f"cat {sys.argv[1]} | gpg --decrypt > {tmp}")


Lines 15-25 refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:27Z

android_fde_decryptkey.py

-assert path.isfile(header_file), "Input file '%s' not found." % header_file
-assert path.isfile(encrypted_partition), (
-    "Input file '%s' not found." % encrypted_partition
-)
+assert path.isfile(header_file), f"Input file '{header_file}' not found."
+assert path.isfile(
+    encrypted_partition
+), f"Input file '{encrypted_partition}' not found."


Lines 36-55 refactored with the following changes:

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

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

sourcery-ai · 2024-01-08T22:06:28Z

ftpmassuploader.py

-        ftp.storlines("STOR %s" % filename, open(filename, "r"))
+        ftp.storlines(f"STOR {filename}", open(filename, "r"))


Function upload refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:28Z

hashtime.py

-a.append("sha3_256")
-a.append("sha3_512")
+a.extend(("sha3_256", "sha3_512"))


Lines 10-11 refactored with the following changes:

Merge consecutive list appends into a single extend (merge-list-appends-into-extend)

sourcery-ai · 2024-01-08T22:06:29Z

imm_pasadas.py

-if l > 4:
-    url = (
-        url_base
-        + "pasadas/"
-        + str(codigo_parada)
-        + "/"
-        + tipo_dia
-        + "/"
-        + str(linea)
-        + "/"
-        + hora
-    )
-else:
-    url = url_base + "pasadas/" + str(codigo_parada) + "/" + tipo_dia + "/" + hora
-
+url = (
+    f"{url_base}pasadas/{str(codigo_parada)}/{tipo_dia}/{str(linea)}/{hora}"
+    if l > 4
+    else f"{url_base}pasadas/{str(codigo_parada)}/{tipo_dia}/{hora}"
+)
 j = json.loads(urllib.request.urlopen(url).read())
 for pasada in j:
    print(
        "Linea:",
        pasada["linea"],
        "Hora:",
-        str(pasada["horaDesc"]),
+        pasada["horaDesc"],


Lines 21-42 refactored with the following changes:

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

Use f-string instead of string concatenation [×14] (use-fstring-for-concatenation)

Remove unnecessary call to str() within print() (remove-str-from-print)

sourcery-ai · 2024-01-08T22:06:29Z

licencia.py

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


Function calculate_best_candidate refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:29Z

logsearch.py

-    tmp = [x for x in range(1024 * 1024 * 20)]
+    tmp = list(range(1024 * 1024 * 20))


Function test refactored with the following changes:

Replace identity comprehension with call to collection constructor (identity-comprehension)

sourcery-ai · 2024-01-08T22:06:31Z

lrutest.py

-        lru.insert("key" + str(i), str(i))
+        lru.insert(f"key{str(i)}", str(i))

-    for i in range(0, 1000):
+    for _ in range(0, 1000):
        lru.get("key13")
-    for i in range(0, 500):
+    for _ in range(0, 500):
        lru.get("key11")
-    for i in range(0, 250):
+    for _ in range(0, 250):
        lru.get("key7")
-    for i in range(0, 125):
+    for _ in range(0, 125):
        lru.get("key5")
        lru.get("key3")
        lru.get("key2")
        lru.get("key1")

    print(lru.access)
-    for i in range(0, 3):
+    for _ in range(0, 3):


Function test refactored with the following changes:

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

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

sourcery-ai · 2024-01-08T22:06:31Z

mmapread.py

-        for line in maps_file.readlines():
+        for line in maps_file:


Lines 11-11 refactored with the following changes:

Iterate over files directly rather than using readlines() (use-file-iterator)

sourcery-ai · 2024-01-08T22:06:31Z

msfhelper.py

-if opt == "-n":
-    remote_hosts = list(ipaddress.IPv4Network(str(sys.argv[2]), strict=False).hosts())
-
 if opt == "-f":
-    remote_hosts = []
    fp = open(sys.argv[2], "r")
-    for line in fp:
-        if line.find("#") == -1:
-            remote_hosts.append(line.strip())
+    remote_hosts = [line.strip() for line in fp if line.find("#") == -1]
+elif opt == "-n":
+    remote_hosts = list(ipaddress.IPv4Network(str(sys.argv[2]), strict=False).hosts())

 for remote_host in remote_hosts:
-    if no_ping:
+    if not no_ping and pyping.ping(str(remote_host)) or no_ping:
        print(payload % (exploit, remote_host, local_host, local_port, meterpreter))
-    else:
-        if pyping.ping(str(remote_host)):
-            print(payload % (exploit, remote_host, local_host, local_port, meterpreter))


Lines 30-45 refactored with the following changes:

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

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

Merge duplicate blocks in conditional (merge-duplicate-blocks)

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2024-01-08T22:06:32Z

originstamp_privkey_get.py

-    data = get_json(fp, line.replace("\n", ""))
-    if data:
+    if data := get_json(fp, line.replace("\n", "")):


Lines 31-32 refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:32Z

pmkid_test_calc.py

-print("Required hash: %s" % REQ)
+print(f"Required hash: {REQ}")
 apmac = "34:bf:90:4a:bb:57"
 clmac = "98:de:d0:1a:97:c2"
 PSK = "786 5555"
 SSID = "unknown"

-print("SSID: [%s]" % SSID)
-print("PSK: [%s]" % PSK)
-print("AP mac: %s" % apmac)
-print("Cl mac: %s" % clmac)
+print(f"SSID: [{SSID}]")
+print(f"PSK: [{PSK}]")
+print(f"AP mac: {apmac}")
+print(f"Cl mac: {clmac}")
 print(
-    "HASH: %s*%s*%s*%s"
-    % (
-        REQ,
-        apmac.replace(":", ""),
-        clmac.replace(":", ""),
-        binascii.hexlify(SSID),
-    )
+    f'HASH: {REQ}*{apmac.replace(":", "")}*{clmac.replace(":", "")}*{binascii.hexlify(SSID)}'
 )

 pmkid, pmk = PMKID(apmac, clmac, PSK, SSID)
-print("PMK: " + binascii.hexlify(pmk))
-print("PMKID: " + binascii.hexlify(pmkid[0:32]))
+print(f"PMK: {binascii.hexlify(pmk)}")
+print(f"PMKID: {binascii.hexlify(pmkid[:32])}")


Lines 14-36 refactored with the following changes:

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

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

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

sourcery-ai · 2024-01-08T22:06:33Z

test_AES256_2.py

-    if binascii.hexlify(sha256(dec)) == sha256_payload_check:
-        return dec
-    else:
-        return False
+    return dec if binascii.hexlify(sha256(dec)) == sha256_payload_check else False


Function test2 refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:33Z

test_rsa.py

-        "Plaintext_decoded: '%s'"
-        % binascii.unhexlify(hex(message).replace("0x", "").replace("L", "").zfill(b))
+        f"""Plaintext_decoded: '{binascii.unhexlify(hex(message).replace("0x", "").replace("L", "").zfill(b))}'"""


Function test refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:33Z

test_rsqrt.py

-    for i in range(0, 1000000):
+    for _ in range(0, 1000000):
        tmp = math.sqrt(n)
    t1 = time.time() - t0
    print(t1)
    t0 = time.time()
-    for i in range(0, 1000000):
+    for _ in range(0, 1000000):
        tmp = math.pow(n, -0.5)
    t1 = time.time() - t0
    print(t1)
    t0 = time.time()
-    for i in range(0, 1000000):
+    for _ in range(0, 1000000):


Function benchmark refactored with the following changes:

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

sourcery-ai · 2024-01-08T22:06:33Z

testpartition.py

-    if n > 0:
-        tmp = []
-        for dataset in data:
-            a, b = split(dataset)
-            tmp += [a] + [b]
-            print(tmp)
-        return partition(n - 1, tmp)
-    else:
+    if n <= 0:
        return data
+    tmp = []
+    for dataset in data:
+        a, b = split(dataset)
+        tmp += [a] + [b]
+        print(tmp)
+    return partition(n - 1, tmp)


Function partition refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

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

sourcery-ai · 2024-01-08T22:06:33Z

testxchain.py

-    url = "https://xchain.io/api/balances/%s" % addr
+    url = f"https://xchain.io/api/balances/{addr}"


Lines 77-77 refactored with the following changes:

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

'Refactored by Sourcery'

aadbe9a

sourcery-ai bot requested a review from daedalus January 8, 2024 22:06

sourcery-ai bot commented Jan 8, 2024

View reviewed changes

daedalus merged commit 2d42521 into master Jan 8, 2024
0 of 2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #4

Sourcery refactored master branch #4

sourcery-ai bot commented Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

sourcery-ai bot Jan 8, 2024

		print("recv:" + ssl_sock.recv(512))
		print(f"recv:{ssl_sock.recv(512)}")

		os.system("cat %s \| gpg --decrypt > %s" % (sys.argv[1], tmp))
		os.system(f"cat {sys.argv[1]} \| gpg --decrypt > {tmp}")

		ftp.storlines("STOR %s" % filename, open(filename, "r"))
		ftp.storlines(f"STOR {filename}", open(filename, "r"))

		tmp = [x for x in range(1024 * 1024 * 20)]
		tmp = list(range(1024 * 1024 * 20))

		url = "https://xchain.io/api/balances/%s" % addr
		url = f"https://xchain.io/api/balances/{addr}"

Sourcery refactored master branch #4

Sourcery refactored master branch #4

Conversation

sourcery-ai bot commented Jan 8, 2024

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment

sourcery-ai bot Jan 8, 2024

Choose a reason for hiding this comment