Sourcery refactored master branch #1

sourcery-ai · 2023-08-30T02:38:08Z

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.

days/01-03-datetimes/code/datetime_date.py

sourcery-ai · 2023-08-30T02:38:11Z

days/01-03-datetimes/code/datetime_timedelta.py

-#Traceback (most recent call last):
-    #File "<pyshell#119>", line 1, in <module> t.hours


Lines 15-30 refactored with the following changes:

Replace datetime.datetime.today() with datetime.datetime.now() (use-datetime-now-not-today)

This removes the following comments ( why? ):

#File "<pyshell#119>", line 1, in <module> t.hours #Traceback (most recent call last):

sourcery-ai · 2023-08-30T02:38:11Z

days/10-12-pytest/fizzbuzz/fizzbuzz.py

-    if n % 3 == 0 and n % 5 == 0:
-        return 'Fizz Buzz'
    if n % 3 == 0:
-        return 'Fizz'
-    if n % 5 == 0:
-        return 'Buzz'
-    return n
+        return 'Fizz Buzz' if n % 5 == 0 else 'Fizz'
+    return 'Buzz' if n % 5 == 0 else n


Function fizzbuzz refactored with the following changes:

Hoist a repeated condition into a parent condition (hoist-repeated-if-condition)

Lift code into else after jump in control flow [×2] (reintroduce-else)

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

sourcery-ai · 2023-08-30T02:38:11Z

days/10-12-pytest/guess/guess.py

-            win = self._validate_guess(guess)
-            if win:
+            if win := self._validate_guess(guess):


Function Game.__call__ refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:11Z

days/13-15-text-games/data/sample_reader.py

-    print("Roll: {}".format(name))
-    for k in row.keys():
+    print(f"Roll: {name}")
+    for k in row:
        can_defeat = row[k].strip().lower() == 'win'
-        print(" * {} will defeat {}? {}".format(name, k, can_defeat))
+        print(f" * {name} will defeat {k}? {can_defeat}")


Function read_roll refactored with the following changes:

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

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

sourcery-ai · 2023-08-30T02:38:12Z

days/37-39-csv-data-analysis/weather_csv_demo/program.py

-        print("{}. {} F on {}".format(idx+1, d.actual_max_temp, d.date))
+        print(f"{idx + 1}. {d.actual_max_temp} F on {d.date}")
    print()
    print("The coldest 5 days:")
    days = research.cold_days()
    for idx, d in enumerate(days[:5]):
-        print("{}. {} F on {}".format(idx+1, d.actual_min_temp, d.date))
+        print(f"{idx + 1}. {d.actual_min_temp} F on {d.date}")
    print()
    print("The wettest 5 days:")

    days = research.wet_days()
    for idx, d in enumerate(days[:5]):
-        print("{}. {} inches of rain on {}".format(idx+1, d.actual_precipitation, d.date))
+        print(f"{idx + 1}. {d.actual_precipitation} inches of rain on {d.date}")


Function main refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:13Z

days/37-39-csv-data-analysis/weather_csv_demo/research.py

-    record = Record(
-        **row
-    )
-
-    return record
+    return Record(**row)


Function parse_row refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:13Z

days/40-42-json-data/code/json_dicts.py

-#Prints just the data associated with the 'name' key.
-
-
-is_flying = []
-for mount in data['mounts']['collected']:
-    if mount['isFlying']:
-        is_flying.append(mount)
-
+is_flying = [
+    mount for mount in data['mounts']['collected'] if mount['isFlying']
+]


Lines 25-32 refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

This removes the following comments ( why? ):

#Prints just the data associated with the 'name' key.

sourcery-ai · 2023-08-30T02:38:13Z

days/43-45-search-api/demo/movie_search/api.py

-    movies = []
-    for r in results.get('hits'):
-        movies.append(Movie(**r))
-
-    return movies
+    return [Movie(**r) for r in results.get('hits')]


Function find_movie_by_title refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

sourcery-ai · 2023-08-30T02:38:13Z

days/46-48-beautifulsoup4/scraper_demo/scraper.py

-    header_list = []
    #Create BeautifulSoup object
    soup = bs4.BeautifulSoup(site.text, 'html.parser')
    html_header_list = soup.select('.projectHeader')

-    for headers in html_header_list:
-        header_list.append(headers.getText())
+    header_list = [headers.getText() for headers in html_header_list]


Function scrape refactored with the following changes:

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

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2023-08-30T02:38:15Z

days/49-51-measuring-perf/demo/final_csv_code/program.py

-        print("{}. {} F on {}".format(idx + 1, d.actual_max_temp, d.date))
+        print(f"{idx + 1}. {d.actual_max_temp} F on {d.date}")
    print()
    print("The coldest 5 days:")

    for idx, d in enumerate(cold_days[:5]):
-        print("{}. {} F on {}".format(idx + 1, d.actual_min_temp, d.date))
+        print(f"{idx + 1}. {d.actual_min_temp} F on {d.date}")
    print()
    print("The wettest 5 days:")

    for idx, d in enumerate(wet_days[:5]):
-        print("{}. {} inches of rain on {}".format(idx + 1, d.actual_precipitation, d.date))
+        print(f"{idx + 1}. {d.actual_precipitation} inches of rain on {d.date}")


Function main refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:15Z

days/49-51-measuring-perf/demo/final_csv_code/program_pycharm.py

-        print("{}. {} F on {}".format(idx + 1, d.actual_max_temp, d.date))
+        print(f"{idx + 1}. {d.actual_max_temp} F on {d.date}")
    print()
    print("The coldest 5 days:")

    for idx, d in enumerate(cold_days[:5]):
-        print("{}. {} F on {}".format(idx + 1, d.actual_min_temp, d.date))
+        print(f"{idx + 1}. {d.actual_min_temp} F on {d.date}")
    print()
    print("The wettest 5 days:")

    for idx, d in enumerate(wet_days[:5]):
-        print("{}. {} inches of rain on {}".format(idx + 1, d.actual_precipitation, d.date))
+        print(f"{idx + 1}. {d.actual_precipitation} inches of rain on {d.date}")


Function main refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:16Z

days/49-51-measuring-perf/demo/final_csv_code/research.py

-    record = Record(
+    return Record(
        date=row.get('date'),
        actual_min_temp=row.get('actual_min_temp'),
        actual_max_temp=row.get('actual_max_temp'),
        actual_precipitation=row.get('actual_precipitation'),
    )

-    return record


Function parse_row refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:16Z

days/49-51-measuring-perf/demo/starter_csv_code/program.py

-        print("{}. {} F on {}".format(idx+1, d.actual_max_temp, d.date))
+        print(f"{idx + 1}. {d.actual_max_temp} F on {d.date}")
    print()
    print("The coldest 5 days:")
    days = research.cold_days()
    for idx, d in enumerate(days[:5]):
-        print("{}. {} F on {}".format(idx+1, d.actual_min_temp, d.date))
+        print(f"{idx + 1}. {d.actual_min_temp} F on {d.date}")
    print()
    print("The wettest 5 days:")

    days = research.wet_days()
    for idx, d in enumerate(days[:5]):
-        print("{}. {} inches of rain on {}".format(idx+1, d.actual_precipitation, d.date))
+        print(f"{idx + 1}. {d.actual_precipitation} inches of rain on {d.date}")


Function main refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:16Z

days/49-51-measuring-perf/demo/starter_csv_code/research.py

-    record = Record(
-        **row
-    )
-
-    return record
+    return Record(**row)


Function parse_row refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:17Z

days/79-81-sqlite3/demos/generatedb.py

-        print('%s.db has been created' % name)
+        print(f'{name}.db has been created')


Lines 26-26 refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:17Z

days/79-81-sqlite3/demos/populatedb.py

-        info = []
        name = input('Enter a name: ')
        address = input('Enter an address: ')
        number = input('Enter a phone number: ')
-        for i in (name, address, number):
-            info.append(i)
-
+        info = [name, address, number]
        with sqlite3.connect("addressbook.db") as connection:
            c = connection.cursor()
            c.execute("INSERT INTO Details VALUES(?, ?, ?)", info)
            print('Data inserted to database.\n')
-            
+


Function enter_details refactored with the following changes:

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

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

Convert for loop into list comprehension (list-comprehension)

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

sourcery-ai · 2023-08-30T02:38:17Z

days/85-87-full-stack-easy/pypoint-100days/forms/AddDocForm.py

-  def button_save_click (self, **event_args):
-    errors = self.validate()
-    if errors:
+  def button_save_click(self, **event_args):
+    if errors := self.validate():
      self.label_errors.text = "\n".join(errors)
      return
-    
+
    name = self.text_box_doc_name.text.strip()
    category = self.drop_down_categories.selected_value
    contents = self.text_area_contents.text.strip()
-    
+


Function AddDocForm.button_save_click refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:17Z

days/85-87-full-stack-easy/pypoint-100days/forms/AllDocsForm.py

-    return "{} {} {}".format(d["name"], d["contents"], d["category"]["name"])
+    return f'{d["name"]} {d["contents"]} {d["category"]["name"]}'


Function AllDocsForm.doc_to_text refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:17Z

days/85-87-full-stack-easy/pypoint-100days/server_modules/data_layer.py

-  results = list(app_tables.documents.search(tables.order_by("created", ascending=False)))
-  return results
+  return list(
+      app_tables.documents.search(tables.order_by("created", ascending=False)))


Function all_docs refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:21Z

days/85-87-full-stack-easy/pypoint-100days/server_modules/data_layer.py

-  print("Server: Creating new document: {} {} {} {}".format(doc_name, category_name, views, contents, now))
+  print(
+      f"Server: Creating new document: {doc_name} {category_name} {views} {contents}"
+  )


Function add_doc refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:21Z

days/88-90-home-inventory-app/code/inventory.py

-        cursor = conn.cursor()
-        yield cursor
+        yield conn.cursor()


Function access_db refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:21Z

days/88-90-home-inventory-app/code/inventory.py

-    menu = {}
-    menu['1'] = "Add Room."
-    menu['2'] = "Add Inventory."
-    menu['3'] = "View Inventory List."
-    menu['4'] = "Total Value."
-    menu['5'] = "Exit."
+    menu = {
+        '1': "Add Room.",
+        '2': "Add Inventory.",
+        '3': "View Inventory List.",
+        '4': "Total Value.",
+        '5': "Exit.",
+    }


Function main_menu refactored with the following changes:

Merge dictionary assignment with declaration [×5] (merge-dict-assign)

sourcery-ai · 2023-08-30T02:38:21Z

days/88-90-home-inventory-app/code/inventory.py

-        cursor.execute("CREATE TABLE '" + name.lower() + "' """"
+        cursor.execute(
+            (
+                f"CREATE TABLE '{name.lower()}" + "' "
+                """
                                    (Item TEXT, Value REAL)
-                                    """)
+                                    """
+            )
+        )


Function add_room refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:21Z

days/88-90-home-inventory-app/code/inventory.py

-        for room in cursor:
-            room_list.append(room[0])
+        room_list.extend(room[0] for room in cursor)


Function list_rooms refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:22Z

days/91-93-sqlalchemy/demo/persistent_rps_starter/game.py

-        print("{}. {}".format(idx + 1, r.name))
+        print(f"{idx + 1}. {r.name}")


Function get_roll_choice refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:22Z

days/91-93-sqlalchemy/demo/persistent_rps_starter/game_decider.py

-    if roll1_wins:
-        return Decision.win
-    else:
-        return Decision.lose
+    return Decision.win if roll1_wins else Decision.lose


Function decide refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:22Z

days/91-93-sqlalchemy/demo/persistent_rps_starter/game_decider.py

-    for k in row.keys():
+    for k in row:


Function __build_roll refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:38:23Z

days/91-93-sqlalchemy/demo/persistent_rps_starter/game_service.py

-    roll = Roll(name)
-    # TODO: Save
-    return roll
+    return Roll(name)


Function create_roll refactored with the following changes:

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

This removes the following comments ( why? ):

# TODO: Save

sourcery-ai · 2023-08-30T02:38:23Z

days/91-93-sqlalchemy/demo/persistent_rps_starter/program.py

-        for row in reader:
-            rolls.append(build_roll(row))
-
+        rolls.extend(build_roll(row) for row in reader)


Function build_rolls refactored with the following changes:

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

'Refactored by Sourcery'

c099d10

sourcery-ai bot requested a review from gloc-mike August 30, 2023 02:38

sourcery-ai bot commented Aug 30, 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 Aug 30, 2023

sourcery-ai bot left a comment

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

sourcery-ai bot Aug 30, 2023

		#Traceback (most recent call last):
		#File "<pyshell#119>", line 1, in <module> t.hours

		print('%s.db has been created' % name)
		print(f'{name}.db has been created')

		return "{} {} {}".format(d["name"], d["contents"], d["category"]["name"])
		return f'{d["name"]} {d["contents"]} {d["category"]["name"]}'

		print("{}. {}".format(idx + 1, r.name))
		print(f"{idx + 1}. {r.name}")

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Aug 30, 2023

sourcery-ai bot left a comment

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment