Sourcery refactored master branch #1

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

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-08-30T02:39:17Z

days/009-012-modern-apis-starred/demo/app.py

-VALID_MANUFACTURERS = set([car["manufacturer"]
-                          for car in cars.values()])
+VALID_MANUFACTURERS = {car["manufacturer"] for car in cars.values()}
 CAR_NOT_FOUND = 'Car not found'

-# definition
-


Lines 17-22 refactored with the following changes:

Replace list(), dict() or set() with comprehension (collection-builtin-to-comprehension)

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

This removes the following comments ( why? ):

# definition

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

days/009-012-modern-apis-starred/demo/test_app.py

-    response = client.delete(f'/99/')
+    response = client.delete('/99/')


Function test_create_car_after_delete refactored with the following changes:

Replace f-string with no interpolated values with string (remove-redundant-fstring)

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

days/017-020-flask-call-apis/code/program/routes.py

-time_now = str(datetime.today())
+time_now = str(datetime.now())


Lines 8-8 refactored with the following changes:

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

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

days/017-020-flask-call-apis/code/program/routes.py

-    r = requests.get('https://pokeapi.co/api/v2/pokemon-color/' + colour.lower())
+    r = requests.get(f'https://pokeapi.co/api/v2/pokemon-color/{colour.lower()}')
    pokedata = r.json()
-    pokemon = []
-
-    for i in pokedata['pokemon_species']:
-        pokemon.append(i['name'])
-
-    return pokemon
+    return [i['name'] for i in pokedata['pokemon_species']]


Function get_poke_colours refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

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

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

days/021-024-quart-async/async_cityscape_api/app.py

-    print("Using cached data? {}".format(data.get('use_cached_data', False)))
+    print(f"Using cached data? {data.get('use_cached_data', False)}")


Function configure_app refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:19Z

days/021-024-quart-async/your_turn/day_4/cityscape_api/app.py

-    print("Using cached data? {}".format(data.get('use_cached_data', False)))
+    print(f"Using cached data? {data.get('use_cached_data', False)}")


Function configure_app refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:19Z

days/021-024-quart-async/your_turn/day_4/cityscape_api/services/location_service.py

-        city_data = data.get(f'{zip_code}, {country}', dict())
+        city_data = data.get(f'{zip_code}, {country}', {})


Function get_lat_long refactored with the following changes:

Replace dict() with {} (dict-literal)

sourcery-ai · 2023-08-30T02:39:19Z

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/program.py

-    if not (0 <= chose_it or chose_it < len(scooters)):
+    if chose_it < 0 and chose_it >= len(scooters):


Function rent_a_scooter refactored with the following changes:

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

Ensure constant in comparison is on the right (flip-comparison)

sourcery-ai · 2023-08-30T02:39:19Z

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/data/session_factory.py

-    conn_str = 'sqlite:///' + db_folder.get_full_path(db_name)
+    conn_str = f'sqlite:///{db_folder.get_full_path(db_name)}'


Function global_init refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:19Z

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/infrastructure/switchlang.py

-        if isinstance(key, list) or isinstance(key, range):
+        if isinstance(key, (list, range)):


Function switch.case refactored with the following changes:

Merge isinstance calls (merge-isinstance)

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

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

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/infrastructure/switchlang.py

-            raise Exception("Value does not match any case and there "
-                            "is no default case: value {}".format(self.value))
+            raise Exception(
+                f"Value does not match any case and there is no default case: value {self.value}"
+            )


Function switch.__exit__ refactored with the following changes:

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

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

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/services/data_service.py

-    scooters = session.query(Scooter).filter(Scooter.location_id == None).all()
+    scooters = session.query(Scooter).filter(Scooter.location_id is None).all()


Function rented_scooters refactored with the following changes:

Use x is None rather than x == None (none-compare)

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

days/033-036-sqlalchemy-orm/demo/hovershare_app_starter/program.py

-    if not (0 <= chose_it or chose_it < len(scooters)):
+    if chose_it < 0 and chose_it >= len(scooters):


Function rent_a_scooter refactored with the following changes:

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

Ensure constant in comparison is on the right (flip-comparison)

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

days/033-036-sqlalchemy-orm/demo/hovershare_app_starter/program.py

-    parked_scooters = []
    # todo show parked scooters
    print()
-    return parked_scooters
+    return []


Function find_available_scooters refactored with the following changes:

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

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

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

days/033-036-sqlalchemy-orm/demo/hovershare_app_starter/infrastructure/switchlang.py

-        if isinstance(key, list) or isinstance(key, range):
+        if isinstance(key, (list, range)):


Function switch.case refactored with the following changes:

Merge isinstance calls (merge-isinstance)

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

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

days/050-responder/demo/movie_svc/data/db.py

-    parts = [
-        p.strip()
-        for p in text.split('|')
-        if p and p.strip()
-    ]
-
-    return parts
+    return [p.strip() for p in text.split('|') if p and p.strip()]


Function __split_separated_text refactored with the following changes:

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

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

days/050-responder/demo/movie_svc/views/api_views.py

-    print("Searching for movie by keyword: {}".format(keyword))
+    print(f"Searching for movie by keyword: {keyword}")


Function search_by_keyword refactored with the following changes:

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

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

days/050-responder/demo/movie_svc/views/api_views.py

-    print("Searching for movie by director: {}".format(director_name))
+    print(f"Searching for movie by director: {director_name}")


Function search_by_director refactored with the following changes:

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

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

days/057-060-flask-login/code/project_awesome/models.py

-        return 'User {}'.format(self.username)
+        return f'User {self.username}'


Function User.__repr__ refactored with the following changes:

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

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

days/057-060-flask-login/code/project_awesome/routes.py

-        user = User.query.filter_by(username=request.form.get('username')).first()
-        if user:
+        if user := User.query.filter_by(
+            username=request.form.get('username')
+        ).first():


Function loginpage refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:27Z

days/057-060-flask-login/code/project_awesome/routes.py

-if __name__ == '__main__':
-    pass


Lines 57-58 refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

sourcery-ai · 2023-08-30T02:39:27Z

days/061-064-db-migrations/demo/billtracker/billtracker/data/db_session.py

-        conn_str = 'sqlite:///' + db_file
-        print("Connecting to DB at: {}".format(conn_str))
+        conn_str = f'sqlite:///{db_file}'
+        print(f"Connecting to DB at: {conn_str}")


Function DbSession.global_init refactored with the following changes:

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

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

sourcery-ai · 2023-08-30T02:39:28Z

days/061-064-db-migrations/demo/billtracker/billtracker/views/default.py

-    return HTTPFound(___location='/bill/{}'.format(bill_id))
+    return HTTPFound(___location=f'/bill/{bill_id}')


Function details_post refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:28Z

days/061-064-db-migrations/your-turn/hovershare_project/hovershare/program.py

-    if not (0 <= chose_it or chose_it < len(scooters)):
+    if chose_it < 0 and chose_it >= len(scooters):


Function rent_a_scooter refactored with the following changes:

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

Ensure constant in comparison is on the right (flip-comparison)

sourcery-ai · 2023-08-30T02:39:28Z

days/061-064-db-migrations/your-turn/hovershare_project/hovershare/data/session_factory.py

-    conn_str = 'sqlite:///' + db_folder.get_full_path(db_name)
+    conn_str = f'sqlite:///{db_folder.get_full_path(db_name)}'


Function global_init refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:29Z

days/081-084-unit-testing/demo/billtracker/billtracker/views/default.py

-    return HTTPFound(___location='/bill/{}'.format(vm.bill_id))
+    return HTTPFound(___location=f'/bill/{vm.bill_id}')


Function details_post refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:29Z

...nit-testing/your-turn/billtracker_with_viewmodels/billtracker/billtracker/data/db_session.py

-        conn_str = 'sqlite:///' + db_file
-        print("Connecting to DB at: {}".format(conn_str))
+        conn_str = f'sqlite:///{db_file}'
+        print(f"Connecting to DB at: {conn_str}")


Function DbSession.global_init refactored with the following changes:

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

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

sourcery-ai · 2023-08-30T02:39:29Z

...rn/billtracker_with_viewmodels/billtracker/billtracker/viewmodels/default/index_viewmodel.py

-            self.error = "No user with ID {}.".format(user_id)
+            self.error = f"No user with ID {user_id}."


Function IndexViewModel.__init__ refactored with the following changes:

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

sourcery-ai · 2023-08-30T02:39:29Z

...-unit-testing/your-turn/billtracker_with_viewmodels/billtracker/billtracker/views/default.py

-    if not vm.bill:
-        return Response(status=404)
-
-    return vm.to_dict()
+    return Response(status=404) if not vm.bill else vm.to_dict()


Function details_get 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-08-30T02:39:29Z

...-unit-testing/your-turn/billtracker_with_viewmodels/billtracker/billtracker/views/default.py

-    return HTTPFound(___location='/bill/{}'.format(vm.bill_id))
+    return HTTPFound(___location=f'/bill/{vm.bill_id}')


Function details_post refactored with the following changes:

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

'Refactored by Sourcery'

369a052

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

sourcery-ai bot commented Aug 30, 2023

View reviewed changes

		response = client.delete(f'/99/')
		response = client.delete('/99/')

		time_now = str(datetime.today())
		time_now = str(datetime.now())

		print("Using cached data? {}".format(data.get('use_cached_data', False)))
		print(f"Using cached data? {data.get('use_cached_data', False)}")

		city_data = data.get(f'{zip_code}, {country}', dict())
		city_data = data.get(f'{zip_code}, {country}', {})

		if not (0 <= chose_it or chose_it < len(scooters)):
		if chose_it < 0 and chose_it >= len(scooters):

		conn_str = 'sqlite:///' + db_folder.get_full_path(db_name)
		conn_str = f'sqlite:///{db_folder.get_full_path(db_name)}'

		if isinstance(key, list) or isinstance(key, range):
		if isinstance(key, (list, range)):

		scooters = session.query(Scooter).filter(Scooter.location_id == None).all()
		scooters = session.query(Scooter).filter(Scooter.location_id is None).all()

		print("Searching for movie by keyword: {}".format(keyword))
		print(f"Searching for movie by keyword: {keyword}")

		print("Searching for movie by director: {}".format(director_name))
		print(f"Searching for movie by director: {director_name}")

		return 'User {}'.format(self.username)
		return f'User {self.username}'

		return HTTPFound(___location='/bill/{}'.format(bill_id))
		return HTTPFound(___location=f'/bill/{bill_id}')

		return HTTPFound(___location='/bill/{}'.format(vm.bill_id))
		return HTTPFound(___location=f'/bill/{vm.bill_id}')

		self.error = "No user with ID {}.".format(user_id)
		self.error = f"No user with ID {user_id}."

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Uh oh!

Conversation

sourcery-ai bot commented Aug 30, 2023

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 30, 2023