Sourcery refactored master branch #2

sourcery-ai · 2023-11-27T20:03:32Z

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-11-27T20:03:34Z

2proc_pmutex.py

-interested = []
-interested.append(False)
-interested.append(False)
+interested = [False, False]


Lines 7-9 refactored with the following changes:

Merge append into list declaration [×2] (merge-list-append)

sourcery-ai · 2023-11-27T20:03:34Z

2proc_pmutex.py

-    t = int(random.randint(0, 1))
+    t = random.randint(0, 1)


Function proc refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:34Z

CVE-2017-7679.py

-        opener.addheaders.append(("Content-Type", "text/html;" + buff))
+        opener.addheaders.append(("Content-Type", f"text/html;{buff}"))
    else:
        opener.addheaders.append(("Content-Type", "text/html;"))

-    data = opener.open(url).read()
-
-    return data
+    return opener.open(url).read()


Function check_url refactored with the following changes:

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

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

sourcery-ai · 2023-11-27T20:03:34Z

SIMM_Pin_Recovery.py

-        E = 0xFF
-        F = 0xFF
-        G = 0xFF
-        H = 0xFF
-
-        if l > 4:
-            E = 0x30 + int(N[4])
-        if l > 5:
-            F = 0x30 + int(N[5])
-        if l > 6:
-            G = 0x30 + int(N[6])
-        if l > 7:
-            H = 0x30 + int(N[7])
-
-        COMM = [
+        E = 0x30 + int(N[4]) if l > 4 else 0xFF
+        F = 0x30 + int(N[5]) if l > 5 else 0xFF
+        G = 0x30 + int(N[6]) if l > 6 else 0xFF
+        H = 0x30 + int(N[7]) if l > 7 else 0xFF
+        return [


Function Attack.encode_pin_cmd refactored with the following changes:

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

Move assignment closer to its usage within a block [×4] (move-assign-in-block)

Move setting of default value for variable into else branch [×4] (introduce-default-else)

Replace if statement with if expression [×4] (assign-if-exp)

This removes the following comments ( why? ):

# APDU with command pkt

sourcery-ai · 2023-11-27T20:03:34Z

SIMM_Pin_Recovery.py

-    if args.startpin:
-        # n= 00274710
-        n = int(args.startpin)
-    else:
-        n = 0
-
+    n = int(args.startpin) if args.startpin else 0


Lines 189-194 refactored with the following changes:

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

This removes the following comments ( why? ):

# n= 00274710

sourcery-ai · 2023-11-27T20:03:35Z

btcaddrinputget.py

-    data = ""
    addrs = []

-    for line in f:
-        data += line
-
+    data = "".join(f)


Function getinputs refactored with the following changes:

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

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

Simplify generator expression (simplify-generator)

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

sourcery-ai · 2023-11-27T20:03:35Z

check_nmap.py

-    fp = open(f, "r")
-    d = fp.read()
-    fp.close()
+    with open(f, "r") as fp:
+        d = fp.read()


Function loadfile refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

sourcery-ai · 2023-11-27T20:03:35Z

check_nmap.py

-    fp = open(f, "w")
-    fp.write(data)
-    fp.close()
+    with open(f, "w") as fp:
+        fp.write(data)


Function savefile refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

sourcery-ai · 2023-11-27T20:03:36Z

check_nmap.py

-    json_data = str(json.dumps(s))
+    json_data = json.dumps(s)


Function json2file refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:36Z

check_nmap.py

-        old_nm = file2json(".check_nmap.py." + host + ".cache")
+        old_nm = file2json(f".check_nmap.py.{host}.cache")


Function getold_nm refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:38Z

check_nmap.py

-                output0 += "tcp %s: %s," % (port, b)
+                output0 += f"tcp {port}: {b},"


Function proc_results refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:38Z

classic_shor.py

-while len(s) == 0:
+while not s:


Lines 48-48 refactored with the following changes:

Simplify sequence length comparison (simplify-len-comparison)

sourcery-ai · 2023-11-27T20:03:38Z

compression_test1.py

-data = ""
-for line in fileinput.input():
-    data += line
-
+data = "".join(fileinput.input())


Lines 85-88 refactored with the following changes:

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

Simplify generator expression (simplify-generator)

sourcery-ai · 2023-11-27T20:03:38Z

count_bits_order.py

-    tmp = 0
-    for i in range(0, len(s) - 1):
-        if s[i] == "1":
-            tmp += 1
-    return tmp
+    return sum(1 for i in range(0, len(s) - 1) if s[i] == "1")


Function count_ones refactored with the following changes:

Convert for loop into call to sum() (sum-comprehension)

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

sourcery-ai · 2023-11-27T20:03:38Z

count_bits_order.py

-    for i in d[k]:
-        data.append(i)
-
+    data.extend(iter(d[k]))


Lines 29-31 refactored with the following changes:

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

Simplify generator expression (simplify-generator)

sourcery-ai · 2023-11-27T20:03:39Z

factordb_report.py

-  print("Factodb: " + str(r))
+  print(f"Factodb: {str(r)}")


Function send2db refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:39Z

factordb_report.py

-data=[]
-#fp=open(sys.argv[1])
-for line in fileinput.input():
-	data.append(line.rstrip())
+data = [line.rstrip() for line in fileinput.input()]


Lines 25-28 refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

This removes the following comments ( why? ):

#fp=open(sys.argv[1])

sourcery-ai · 2023-11-27T20:03:40Z

fcut.py

-if len(sys.argv)>3:
-	fp_dump = open(sys.argv[3],'w')
-else:
-	fp_dump = None
-
+fp_dump = open(sys.argv[3],'w') if len(sys.argv)>3 else None


Lines 37-41 refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:40Z

ftpmassuploader.py

-                    ipaddr = str(a) + "." + str(b) + "." + str(c) + "." + str(d)
+                    ipaddr = f"{str(a)}.{str(b)}.{str(c)}.{str(d)}"


Lines 39-39 refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:40Z

hashtime.py

-        dt = t2 - t1
-        return dt
+        return t2 - t1


Function measure refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:42Z

integerencoder.py

-    if big_endian:
-        return struct.pack(">I", value)
-    else:
-        return struct.pack("<I", value)
+    return struct.pack(">I", value) if big_endian else struct.pack("<I", value)


Function uint32tobytes refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:42Z

integerencoder.py

-    if big_endian:
-        return struct.pack(">i", value)
-    else:
-        return struct.pack("<i", value)
+    return struct.pack(">i", value) if big_endian else struct.pack("<i", value)


Function int32tobytes refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:42Z

licencia.py

-    # Feriados en Uruguay
-    holidays = [  # feriados no laborables
+    return [  # feriados no laborables
        date(year=year, month=1, day=1),  # dia del transportista
        date(year=year, month=5, day=1),  # dia de los trabajadores
        date(year=year, month=7, day=18),  # dia de la independencia
-        date(year=year, month=8, day=25),  # dia de la declaratoria de la independencia
+        date(
+            year=year, month=8, day=25
+        ),  # dia de la declaratoria de la independencia


Function init_holidays refactored with the following changes:

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

This removes the following comments ( why? ):

# Feriados en Uruguay

sourcery-ai · 2023-11-27T20:03:42Z

list_time_test.py

-    d = s2 - s1
-    return d
+    return s2 - s1


Function test refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:42Z

logsearch.py

-    for i in xrange(imin, imax):
+    for _ in xrange(imin, imax):


Function seek refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:43Z

simplecrypt.py

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


Function stretch_password refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:44Z

sqrt_crypt.py

-        h = "0" + h
+        h = f"0{h}"


Function inttobin refactored with the following changes:

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

sourcery-ai · 2023-11-27T20:03:44Z

sqrt_crypt.py

-	l = len(plaintext)
-	n=0
-	cont = True
-	while cont:
-		a = bintoint(plaintext + (" "*n))
-		b = gmpy2.isqrt(a)
-		c = b**2
-		tmp = inttobin(c)
-		n+=1
-		cont = not (tmp[0:l] == plaintext)
-	return b,n
+    l = len(plaintext)
+    n=0
+    cont = True
+    while cont:
+        a = bintoint(plaintext + (" "*n))
+        b = gmpy2.isqrt(a)
+        c = b**2
+        tmp = inttobin(c)
+        n+=1
+        cont = tmp[:l] != plaintext
+    return b,n


Function crypt refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

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

sourcery-ai · 2023-11-27T20:03:44Z

sslcertget.py

-        print(hostname + ":" + str(port))
+        print(f"{hostname}:{str(port)}")
        try:
            pem = ssl.get_server_certificate((hostname, port))
            if pem != None:
                print(pem)
-                fp = open("output/%s_%d.pem" % (hostname, port), "w")
-                fp.write(pem + "\n")
-                fp.close()
+                with open("output/%s_%d.pem" % (hostname, port), "w") as fp:
+                    fp.write(pem + "\n")
        except:
-            print(hostname + " error")
+            print(f"{hostname} error")


Lines 16-25 refactored with the following changes:

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

Use with when opening file to ensure closure (ensure-file-closed)

sourcery-ai · 2023-11-27T20:03:44Z

testALU.py

-        tmp = ""
-        for byte in val:
-            tmp += bin(ord(byte)).replace("0b", "")
-        return "0b" + tmp.zfill(32)
+        tmp = "".join(bin(ord(byte)).replace("0b", "") for byte in val)
+        return f"0b{tmp.zfill(32)}"


Function bitrepr32 refactored with the following changes:

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

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

'Refactored by Sourcery'

abd98be

sourcery-ai bot requested a review from daedalus November 27, 2023 20:03

sourcery-ai bot commented Nov 27, 2023

View reviewed changes

sourcery-ai bot force-pushed the sourcery/master branch from e794b29 to abd98be Compare November 27, 2023 20:27

daedalus merged commit 015125b into master Nov 27, 2023
1 check failed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #2

Sourcery refactored master branch #2

sourcery-ai bot commented Nov 27, 2023

sourcery-ai bot left a comment

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

sourcery-ai bot Nov 27, 2023

		old_nm = file2json(".check_nmap.py." + host + ".cache")
		old_nm = file2json(f".check_nmap.py.{host}.cache")

		output0 += "tcp %s: %s," % (port, b)
		output0 += f"tcp {port}: {b},"

		ipaddr = str(a) + "." + str(b) + "." + str(c) + "." + str(d)
		ipaddr = f"{str(a)}.{str(b)}.{str(c)}.{str(d)}"

Sourcery refactored master branch #2

Sourcery refactored master branch #2

Conversation

sourcery-ai bot commented Nov 27, 2023

sourcery-ai bot left a comment

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 27, 2023

Choose a reason for hiding this comment