Sourcery Starbot ⭐ refactored gkitg/edu_tmp #1

SourceryAI · 2023-06-30T12:44:28Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

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

git fetch https://github.com/sourcery-ai-bot/edu_tmp master
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI · 2023-06-30T12:44:29Z

Python/0_algorithms/hw_1/08_leap_year.py

-    
+
 # длинный способ
-if year % 4 != 0:
-    print("Обычный")
-elif year % 100 == 0:
-    if year % 400 == 0:
-        print("Високосный")
-    else:
-        print("Обычный")
+if (
+    year % 4 == 0
+    and year % 100 == 0
+    and year % 400 == 0
+    or year % 4 == 0
+    and year % 100 != 0
+):
+    print("Високосный")
 else:
-    print("Високосный")
+    print("Обычный")


Lines 15-25 refactored with the following changes:

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

SourceryAI · 2023-06-30T12:44:29Z

Python/0_algorithms/hw_2/02_even_odd.py

-    num = num // 10
+    num //= 10


Lines 17-17 refactored with the following changes:

Replace assignment with augmented assignment (aug-assign)

SourceryAI · 2023-06-30T12:44:30Z

Python/0_algorithms/hw_2/03_revers.py

-    num = num // 10
+    num //= 10


Lines 14-14 refactored with the following changes:

Replace assignment with augmented assignment (aug-assign)

SourceryAI · 2023-06-30T12:44:30Z

Python/0_algorithms/hw_2/07_teorema.py

-    if n == 1:
-        return n
-    sum_n = n + sum_natural(n - 1)
-    return sum_n
+    return n if n == 1 else n + sum_natural(n - 1)


Function sum_natural refactored with the following changes:

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

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

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

SourceryAI · 2023-06-30T12:44:30Z

Python/0_algorithms/hw_2/09_max_sum.py

-    if number < 10:
-        return number
-    return number % 10 + sum_digits(number // 10)
+    return number if number < 10 else number % 10 + sum_digits(number // 10)


Function sum_digits 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)

SourceryAI · 2023-06-30T12:44:34Z

Python/0_algorithms/hw_4/2_deque.py

-    x = "".join([i for i in x])
-    y = "".join([i for i in y])
+    x = "".join(list(x))
+    y = "".join(list(y))


Function hex_sum refactored with the following changes:

Replace identity comprehension with call to collection constructor [×2] (identity-comprehension)

SourceryAI · 2023-06-30T12:44:34Z

Python/0_algorithms/hw_4/2_deque.py

-    x = "".join([i for i in x])
-    y = "".join([i for i in y])
+    x = "".join(list(x))
+    y = "".join(list(y))


Function hex_mul refactored with the following changes:

Replace identity comprehension with call to collection constructor [×2] (identity-comprehension)

SourceryAI · 2023-06-30T12:44:34Z

Python/0_algorithms/hw_4/2_namedtuple_deque.py

-        else:
-            r = deque()
-            while x > 15:
-                d = x % 16
-                r.appendleft(str(d) if d < 10 else self.hex_letters._fields[d-10])
-                x = x // 16
-            r.appendleft(str(x) if x < 10 else self.hex_letters._fields[x-10])
-            return list(r)
+        r = deque()
+        while x > 15:
+            d = x % 16
+            r.appendleft(str(d) if d < 10 else self.hex_letters._fields[d-10])
+            x = x // 16
+        r.appendleft(str(x) if x < 10 else self.hex_letters._fields[x-10])
+        return list(r)


Function HexCalc.to_hex refactored with the following changes:

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

SourceryAI · 2023-06-30T12:44:34Z

Python/0_algorithms/hw_4/2_ordereddict_deque.py

-    return sum([hex_number[j] * (16 ** i) for i, j in enumerate(num)])
+    return sum(hex_number[j] * (16 ** i) for i, j in enumerate(num))


Function hex_to_decimal refactored with the following changes:

Replace unneeded comprehension with generator (comprehension-to-generator)

SourceryAI · 2023-06-30T12:44:35Z

Python/0_algorithms/hw_4/t_sieve.py

-    for key in pi_func.keys():
+    for key, size in pi_func.items():
        if num <= key:
-            size = pi_func[key]
            break

-    array = [i for i in range(size)]
+    array = list(range(size))


Function prime refactored with the following changes:

Use items() to directly unpack dictionary values (use-dict-items)

Remove unnecessary call to keys() (remove-dict-keys)

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

SourceryAI · 2023-06-30T12:44:38Z

Python/0_algorithms/hw_5/2_loop_sample.py

-for i in range(num):
+for _ in range(num):
    name = input('name = ')
-    spam = []
-    for j in range(1, 5):
-        spam.append(int(input(f'{j} = ')))
+    spam = [int(input(f'{j} = ')) for j in range(1, 5)]


Lines 7-11 refactored with the following changes:

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

Convert for loop into list comprehension (list-comprehension)

SourceryAI · 2023-06-30T12:44:39Z

Python/0_algorithms/hw_6/02_even_odd.py

-    num = num // 10
+    num //= 10


Lines 15-32 refactored with the following changes:

Replace assignment with augmented assignment [×2] (aug-assign)

SourceryAI · 2023-06-30T12:44:39Z

Python/0_algorithms/hw_6/_1.py

-orig_list = [random.randint(-100, 100) for i in range(10)]
+orig_list = [random.randint(-100, 100) for _ in range(10)]


Lines 40-40 refactored with the following changes:

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

SourceryAI · 2023-06-30T12:44:39Z

Python/0_algorithms/hw_6/_2.py

-    if len(alist)>1:
-        mid = len(alist)//2
-        lefthalf = alist[:mid]
-        righthalf = alist[mid:]
-
-        merge_sort(lefthalf)
-        merge_sort(righthalf)
-
-        i=0
-        j=0
-        k=0
-        while i<len(lefthalf) and j<len(righthalf):
-            if lefthalf[i]<righthalf[j]:
-                alist[k]=lefthalf[i]
-                i=i+1
-            else:
-                alist[k]=righthalf[j]
-                j=j+1
-            k=k+1
-
-        while i<len(lefthalf):
+    if len(alist) <= 1:
+        return
+    mid = len(alist)//2
+    lefthalf = alist[:mid]
+    righthalf = alist[mid:]
+
+    merge_sort(lefthalf)
+    merge_sort(righthalf)
+
+    i=0
+    j=0
+    k=0
+    while i<len(lefthalf) and j<len(righthalf):
+        if lefthalf[i]<righthalf[j]:
            alist[k]=lefthalf[i]
-            i=i+1
-            k=k+1
-
-        while j<len(righthalf):
+            i += 1
+        else:
            alist[k]=righthalf[j]
-            j=j+1
-            k=k+1
+            j += 1
+        k=k+1
+
+    while i<len(lefthalf):
+        alist[k]=lefthalf[i]
+        i += 1
+        k=k+1
+
+    while j<len(righthalf):
+        alist[k]=righthalf[j]
+        j += 1
+        k=k+1


Function merge_sort refactored with the following changes:

Add guard clause (last-if-guard)

Replace assignment with augmented assignment [×4] (aug-assign)

SourceryAI · 2023-06-30T12:44:39Z

Python/0_algorithms/hw_6/_2.py

-alist = [random.random()*50 for i in range(n)]
+alist = [random.random()*50 for _ in range(n)]


Lines 43-43 refactored with the following changes:

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

SourceryAI · 2023-06-30T12:44:41Z

Python/1_home/3.py

-        if any(i.isupper() for i in data) and any(i.islower() for i in data) and any(i.isdigit() for i in data):
-            return True
-        else:
-            return False
+        return (
+            any(i.isupper() for i in data)
+            and any(i.islower() for i in data)
+            and any(i.isdigit() for i in data)
+        )


Function checkio refactored with the following changes:

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)

SourceryAI · 2023-06-30T12:44:41Z

Python/1_home/3.py

-    newlst=[]
-    for i in data:
-        if data.count(i)>1:
-            newlst.append(i)
-    return newlst
+    return [i for i in data if data.count(i)>1]


Function checkio refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

SourceryAI · 2023-06-30T12:44:42Z

Python/1_home/3.py

-    assert list(checkio([1, 2, 3, 4, 5])) == [], "2nd example"
+    assert not list(checkio([1, 2, 3, 4, 5])), "2nd example"


Lines 67-67 refactored with the following changes:

Replaces an empty collection equality with a boolean operation (simplify-empty-collection-comparison)

SourceryAI · 2023-06-30T12:44:42Z

Python/1_home/4.py

-    segment = (((x1 - x2) ** 2) + ((y1 - y2) ** 2)) ** 0.5
-    return segment
+    return (((x1 - x2) ** 2) + ((y1 - y2) ** 2)) ** 0.5


Function length_segment refactored with the following changes:

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

SourceryAI · 2023-06-30T12:44:42Z

Python/1_home/4.py

-    elif (line_a[0] == line_b[0] and (line_a[0] != line_c[0] or line_b[0] != line_c[0])):
+    elif line_a[0] == line_b[0]:
        print("a || b")
        print(0)
-    elif (line_a[0] == line_c[0] and (line_a[0] != line_b[0] or line_c[0] != line_b[0])):
+    elif line_a[0] == line_c[0]:
        print("a || с")
        print(0)
-    elif (line_b[0] == line_c[0] and (line_b[0] != line_a[0] or line_c[0] != line_a[0])):
+    elif line_b[0] == line_c[0]:


Function run refactored with the following changes:

Remove redundant conditional [×3] (remove-redundant-if)

'Refactored by Sourcery'

d6a818a

SourceryAI commented Jun 30, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Sourcery Starbot ⭐ refactored gkitg/edu_tmp #1

Sourcery Starbot ⭐ refactored gkitg/edu_tmp #1

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

		return sum([hex_number[j] * (16 ** i) for i, j in enumerate(num)])
		return sum(hex_number[j] * (16 ** i) for i, j in enumerate(num))

		orig_list = [random.randint(-100, 100) for i in range(10)]
		orig_list = [random.randint(-100, 100) for _ in range(10)]

		alist = [random.random()*50 for i in range(n)]
		alist = [random.random()*50 for _ in range(n)]

		assert list(checkio([1, 2, 3, 4, 5])) == [], "2nd example"
		assert not list(checkio([1, 2, 3, 4, 5])), "2nd example"

Sourcery Starbot ⭐ refactored gkitg/edu_tmp #1

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored gkitg/edu_tmp #1

Uh oh!

Conversation

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!