From 762eaeec0c0cd5dff6601ea7e21f56dacf97b532 Mon Sep 17 00:00:00 2001 From: Geir Arne Hjelle Date: Mon, 6 May 2024 13:34:58 +0200 Subject: [PATCH] Upgrade linters and switch to Ruff (#530) * Update Python, Black, and Flake8 versions * Black 24 updates * Switch from Flake8 to Ruff for linting * Ruff fixes * Add information about Ruff in README * Black --------- Co-authored-by: Dan Bader --- .github/workflows/dircheck.py | 1 + .github/workflows/linters.yml | 4 +-- README.md | 4 +-- arcade-a-primer/arcade_game.py | 3 ++- .../arcade_platformer/02_open_game_window.py | 3 ++- .../arcade_platformer/03_read_level_one.py | 3 ++- .../arcade_platformer/04_define_player.py | 3 ++- .../arcade_platformer/05_update_and_draw.py | 3 ++- .../arcade_platformer/06_keyboard_movement.py | 3 ++- .../arcade_platformer/07_scrolling_view.py | 3 ++- .../arcade_platformer/08_on_screen_score.py | 3 ++- .../arcade_platformer/09_joystick_control.py | 3 ++- .../arcade_platformer/10_view_conversion.py | 3 ++- .../arcade_platformer/11_title_view.py | 3 ++- .../arcade_platformer/12_instructions_view.py | 3 ++- .../arcade_platformer/13_pause_view.py | 3 ++- .../arcade_platformer/14_enemies.py | 3 ++- .../arcade_platformer/15_moving_platforms.py | 3 ++- .../arcade_platformer/arcade_platformer.py | 3 ++- .../source_code_final/space_rocks/__main__.py | 1 - .../source_code_final/space_rocks/game.py | 1 - .../source_code_final/space_rocks/models.py | 1 - .../space_rocks/__main__.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_10/space_rocks/game.py | 1 - .../source_code_step_10/space_rocks/models.py | 1 - .../space_rocks/__main__.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_3/space_rocks/game.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_4/space_rocks/game.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_5/space_rocks/game.py | 1 - .../source_code_step_5/space_rocks/models.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_6/space_rocks/game.py | 1 - .../source_code_step_6/space_rocks/models.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_7/space_rocks/game.py | 1 - .../source_code_step_7/space_rocks/models.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_8/space_rocks/game.py | 1 - .../source_code_step_8/space_rocks/models.py | 1 - .../space_rocks/__main__.py | 1 - .../source_code_step_9/space_rocks/game.py | 1 - .../source_code_step_9/space_rocks/models.py | 1 - asyncio-walkthrough/areq.py | 2 +- binary-search/benchmark.py | 2 +- binary-search/download_imdb.py | 7 ++--- binary-search/search/binary.py | 4 +-- binary-search/search/linear.py | 2 +- binary-search/search/random.py | 4 +-- brython/base64/form/main.py | 3 ++- brython/base64/sep/main.py | 3 ++- brython/base64/storage/main.py | 7 ++--- brython/base64/storage_perf/main.py | 5 ++-- brython/hashes/main.py | 3 ++- brython/sha256/main.py | 7 ++--- brython/vuejs/main.py | 3 ++- .../django-blog/blog/admin.py | 1 + .../django-blog/blog/urls.py | 1 + .../django-blog/personal_blog/urls.py | 2 +- .../content_aggregator/urls.py | 3 ++- .../podcasts/management/commands/startjobs.py | 11 ++++---- .../source_code_final/podcasts/tests.py | 2 +- .../source_code_final/podcasts/urls.py | 1 - .../content_aggregator/urls.py | 1 + .../content_aggregator/urls.py | 1 + .../source_code_step_2/podcasts/tests.py | 1 + .../content_aggregator/urls.py | 3 ++- .../source_code_step_3/podcasts/tests.py | 2 +- .../source_code_step_3/podcasts/urls.py | 1 - .../content_aggregator/urls.py | 3 ++- .../source_code_step_4/podcasts/tests.py | 2 +- .../source_code_step_4/podcasts/urls.py | 1 - .../content_aggregator/urls.py | 3 ++- .../podcasts/management/commands/startjobs.py | 4 +-- .../source_code_step_5/podcasts/tests.py | 2 +- .../source_code_step_5/podcasts/urls.py | 1 - .../content_aggregator/urls.py | 3 ++- .../podcasts/management/commands/startjobs.py | 4 +-- .../source_code_step_6/podcasts/tests.py | 2 +- .../source_code_step_6/podcasts/urls.py | 1 - .../content_aggregator/urls.py | 3 ++- .../podcasts/management/commands/startjobs.py | 11 ++++---- .../source_code_step_7/podcasts/tests.py | 2 +- .../source_code_step_7/podcasts/urls.py | 1 - build-a-gui-with-wxpython/mp3_tag_editor.py | 3 ++- .../source_code_final/app.py | 3 +-- .../source_code_final/init_database.py | 2 +- .../source_code_final/models.py | 3 +-- .../source_code_final/notes.py | 3 +-- .../source_code_final/people.py | 3 +-- .../source_code_final_before/app.py | 3 +-- .../source_code_final_before/models.py | 3 +-- .../source_code_final_before/notes.py | 3 +-- .../source_code_final_before/people.py | 3 +-- .../source_code_start/app.py | 3 +-- .../source_code_start/init_database.py | 2 +- .../source_code_start/models.py | 3 +-- .../source_code_start/notes.py | 3 +-- .../source_code_start/people.py | 3 +-- .../source_code_step_1/app.py | 3 +-- .../source_code_step_1/init_database.py | 2 +- .../source_code_step_1/models.py | 3 +-- .../source_code_step_1/notes.py | 3 +-- .../source_code_step_1/people.py | 3 +-- .../source_code_step_2/app.py | 3 +-- .../source_code_step_2/init_database.py | 2 +- .../source_code_step_2/models.py | 3 +-- .../source_code_step_2/notes.py | 3 +-- .../source_code_step_2/people.py | 3 +-- .../source_code_step_3/app.py | 3 +-- .../source_code_step_3/init_database.py | 2 +- .../source_code_step_3/models.py | 3 +-- .../source_code_step_3/notes.py | 3 +-- .../source_code_step_3/people.py | 3 +-- .../source_code_step_4/app.py | 3 +-- .../source_code_step_4/init_database.py | 2 +- .../source_code_step_4/models.py | 3 +-- .../source_code_step_4/notes.py | 3 +-- .../source_code_step_4/people.py | 3 +-- .../source_code_step_5/app.py | 3 +-- .../source_code_step_5/init_database.py | 2 +- .../source_code_step_5/models.py | 3 +-- .../source_code_step_5/notes.py | 3 +-- .../source_code_step_5/people.py | 3 +-- .../source_code_final/django_celery/urls.py | 1 + .../source_code_initial/django_celery/urls.py | 1 + chatgpt-mentor/fizzbuzz_chatgpt_option_2.py | 12 ++++----- chatgpt-mentor/fizzbuzz_chatgpt_option_3.py | 12 ++++----- .../test_fizzbuzz_pytest.py | 1 - chatterbot/source_code_final/bot.py | 4 +-- chatterbot/source_code_step_5/bot.py | 4 +-- code-image-generator/source_code_final/app.py | 1 + .../source_code_step_04/app.py | 1 + concurrency-overview/io_asyncio.py | 1 + concurrency-overview/io_mp.py | 3 ++- concurrency-overview/io_non_concurrent.py | 3 ++- concurrency-overview/io_threading.py | 2 +- concurrency-overview/race_condition.py | 1 - crud-operations/crud_fastapi.py | 9 +++---- crud-operations/crud_sql_alchemy.py | 2 +- django-diary/source_code_final/diary/urls.py | 2 +- .../source_code_final/entries/admin.py | 1 + .../source_code_final/entries/views.py | 8 +++--- django-diary/source_code_step_1/diary/urls.py | 1 + django-diary/source_code_step_2/diary/urls.py | 1 + .../source_code_step_2/entries/admin.py | 1 + django-diary/source_code_step_3/diary/urls.py | 2 +- .../source_code_step_3/entries/admin.py | 1 + .../source_code_step_3/entries/views.py | 2 +- django-diary/source_code_step_4/diary/urls.py | 2 +- .../source_code_step_4/entries/admin.py | 1 + .../source_code_step_4/entries/views.py | 2 +- django-diary/source_code_step_5/diary/urls.py | 2 +- .../source_code_step_5/entries/admin.py | 1 + .../source_code_step_5/entries/views.py | 6 ++--- django-diary/source_code_step_6/diary/urls.py | 2 +- .../source_code_step_6/entries/admin.py | 1 + .../source_code_step_6/entries/views.py | 6 ++--- .../cards/templatetags/cards_tags.py | 3 +-- .../source_code_final/cards/views.py | 4 +-- .../source_code_final/flashcards/urls.py | 3 +-- .../source_code_step_1/flashcards/urls.py | 1 + .../source_code_step_2/flashcards/urls.py | 3 ++- .../source_code_step_3/flashcards/urls.py | 3 ++- .../source_code_step_4/cards/views.py | 2 +- .../source_code_step_4/flashcards/urls.py | 3 ++- .../source_code_step_5/cards/views.py | 2 +- .../source_code_step_5/flashcards/urls.py | 3 ++- .../cards/templatetags/cards_tags.py | 3 +-- .../source_code_step_6/cards/views.py | 2 +- .../source_code_step_6/flashcards/urls.py | 3 ++- django-gunicorn-nginx/myapp/urls.py | 1 + .../portfolio-project/portfolio/settings.py | 3 ++- .../portfolio-project/portfolio/urls.py | 1 + .../portfolio-project/portfolio/urls.py | 1 + .../portfolio-project/portfolio/urls.py | 1 + .../portfolio-project/portfolio/settings.py | 3 ++- .../portfolio-project/portfolio/urls.py | 1 + .../portfolio-project/portfolio/settings.py | 3 ++- .../portfolio-project/portfolio/urls.py | 1 + django-markdown/dmd_project/urls.py | 1 - .../bitcoin_tracker/settings.py | 6 ++--- .../bitcoin_tracker/bitcoin_tracker/urls.py | 1 + django-pagination/pythonwiki/urls.py | 2 +- django-pagination/terms/urls.py | 1 + django-pagination/terms/views.py | 4 +-- .../source_code_final/todo_app/admin.py | 1 + .../source_code_final/todo_app/models.py | 3 +-- .../source_code_final/todo_app/urls.py | 1 + .../source_code_final/todo_app/views.py | 6 ++--- .../source_code_final/todo_project/urls.py | 1 + .../source_code_step_2/todo_project/urls.py | 4 +-- .../source_code_step_3/todo_app/models.py | 3 +-- .../source_code_step_3/todo_project/urls.py | 4 +-- .../source_code_step_4/todo_app/admin.py | 1 + .../source_code_step_4/todo_app/models.py | 3 +-- .../source_code_step_4/todo_project/urls.py | 4 +-- .../source_code_step_5/todo_app/admin.py | 1 + .../source_code_step_5/todo_app/models.py | 3 +-- .../source_code_step_5/todo_app/urls.py | 1 + .../source_code_step_5/todo_app/views.py | 3 ++- .../source_code_step_5/todo_project/urls.py | 5 ++-- .../source_code_step_6/todo_app/admin.py | 1 + .../source_code_step_6/todo_app/models.py | 3 +-- .../source_code_step_6/todo_app/urls.py | 1 + .../source_code_step_6/todo_app/views.py | 4 +-- .../source_code_step_6/todo_project/urls.py | 1 + .../source_code_step_7/todo_app/admin.py | 1 + .../source_code_step_7/todo_app/models.py | 3 +-- .../source_code_step_7/todo_app/urls.py | 1 + .../source_code_step_7/todo_app/views.py | 6 ++--- .../source_code_step_7/todo_project/urls.py | 1 + django-view-auth/Blog/Blog/urls.py | 4 +-- django-view-auth/Blog/core/admin.py | 1 + django-view-auth/Blog/core/views.py | 3 ++- .../source_code_final/back_end/blog/admin.py | 3 ++- .../source_code_final/back_end/blog/models.py | 2 +- .../back_end/backend/urls.py | 1 + .../back_end/backend/urls.py | 1 + .../source_code_step_2/back_end/blog/admin.py | 3 ++- .../back_end/blog/models.py | 2 +- .../source_code_step_3/back_end/blog/admin.py | 3 ++- .../back_end/blog/models.py | 2 +- .../source_code_step_4/back_end/blog/admin.py | 3 ++- .../back_end/blog/models.py | 2 +- .../source_code_step_5/back_end/blog/admin.py | 3 ++- .../back_end/blog/models.py | 2 +- .../source_code_step_6/back_end/blog/admin.py | 3 ++- .../back_end/blog/models.py | 2 +- .../source_code_step_7/back_end/blog/admin.py | 3 ++- .../back_end/blog/models.py | 2 +- .../source_code_step_8/back_end/blog/admin.py | 3 ++- .../back_end/blog/models.py | 2 +- .../web/test/conftest.py | 1 - duck-typing-python/shapes.py | 6 ++--- .../source_code_final/dwitter/admin.py | 3 ++- .../source_code_final/dwitter/models.py | 2 +- .../source_code_final/social/urls.py | 1 + .../source_code_step_01/dwitter/admin.py | 2 +- .../source_code_step_01/social/urls.py | 1 + .../source_code_step_02/dwitter/admin.py | 3 ++- .../source_code_step_02/dwitter/models.py | 2 +- .../source_code_step_02/social/urls.py | 1 + .../source_code_step_03/dwitter/admin.py | 3 ++- .../source_code_step_03/dwitter/models.py | 2 +- .../source_code_step_03/social/urls.py | 1 + .../source_code_final/dwitter/admin.py | 3 ++- .../source_code_final/dwitter/models.py | 2 +- .../source_code_final/dwitter/urls.py | 3 ++- .../source_code_final/dwitter/views.py | 1 + .../source_code_final/social/urls.py | 3 ++- .../source_code_start/dwitter/admin.py | 3 ++- .../source_code_start/dwitter/models.py | 2 +- .../source_code_start/social/urls.py | 1 + .../source_code_step_04/dwitter/admin.py | 3 ++- .../source_code_step_04/dwitter/models.py | 2 +- .../source_code_step_04/dwitter/urls.py | 1 + .../source_code_step_04/social/urls.py | 3 ++- .../source_code_step_05/dwitter/admin.py | 3 ++- .../source_code_step_05/dwitter/models.py | 2 +- .../source_code_step_05/dwitter/urls.py | 1 + .../source_code_step_05/dwitter/views.py | 1 + .../source_code_step_05/social/urls.py | 3 ++- .../source_code_step_06/dwitter/admin.py | 3 ++- .../source_code_step_06/dwitter/models.py | 2 +- .../source_code_step_06/dwitter/urls.py | 3 ++- .../source_code_step_06/dwitter/views.py | 1 + .../source_code_step_06/social/urls.py | 3 ++- .../source_code_final/dwitter/urls.py | 3 ++- .../source_code_final/social/urls.py | 3 ++- .../source_code_start/dwitter/admin.py | 3 ++- .../source_code_start/dwitter/models.py | 2 +- .../source_code_start/dwitter/urls.py | 3 ++- .../source_code_start/dwitter/views.py | 1 + .../source_code_start/social/urls.py | 3 ++- .../source_code_step_07/dwitter/admin.py | 3 ++- .../source_code_step_07/dwitter/models.py | 2 +- .../source_code_step_07/dwitter/urls.py | 3 ++- .../source_code_step_07/social/urls.py | 3 ++- .../source_code_step_08/dwitter/urls.py | 3 ++- .../source_code_step_08/social/urls.py | 3 ++- .../source_code_step_09/dwitter/urls.py | 3 ++- .../source_code_step_09/social/urls.py | 3 ++- .../source_code_final/dwitter/urls.py | 3 ++- .../source_code_final/dwitter/views.py | 2 +- .../source_code_final/social/urls.py | 3 ++- .../source_code_start/dwitter/urls.py | 3 ++- .../source_code_start/social/urls.py | 3 ++- .../source_code_step_10/dwitter/urls.py | 3 ++- .../source_code_step_10/social/urls.py | 3 ++- .../source_code_step_11/dwitter/urls.py | 3 ++- .../source_code_step_11/social/urls.py | 3 ++- .../source_code_step_12/dwitter/urls.py | 3 ++- .../source_code_step_12/dwitter/views.py | 2 +- .../source_code_step_12/social/urls.py | 3 ++- .../PyEval/expr_test.py | 3 ++- embedded-python/simon_says.py | 3 ++- .../create_car_review_collection.py | 3 +-- .../text_embeddings.py | 3 +-- .../word_vectors.py | 4 +-- .../source_code_final/shortener_app/main.py | 3 +-- .../source_code_step_2/shortener_app/main.py | 2 +- .../source_code_step_3/shortener_app/main.py | 1 - .../rp_flask_api/app.py | 3 +-- .../rp_flask_api/people.py | 3 +-- .../rp_flask_api/app.py | 3 +-- .../rp_flask_api/models.py | 3 +-- .../rp_flask_api/notes.py | 3 +-- .../rp_flask_api/people.py | 3 +-- flask-connexion-rest-part-4/build_database.py | 3 ++- flask-connexion-rest-part-4/config.py | 3 ++- flask-connexion-rest-part-4/models.py | 1 + flask-connexion-rest-part-4/notes.py | 4 +-- flask-connexion-rest-part-4/people.py | 4 +-- flask-connexion-rest-part-4/server.py | 4 +-- flask-database/board/__init__.py | 3 ++- flask-database/board/database.py | 1 + flask-google-login/app.py | 9 ++++--- flask-google-login/user.py | 3 +-- flask-logging/board/__init__.py | 1 + flask-logging/board/database.py | 1 + geoshops/nearbyshops/admin.py | 1 + geoshops/nearbyshops/views.py | 5 ++-- geoshops/shops/urls.py | 2 ++ .../test_hashtable.py | 2 +- .../03_find_a_value_by_key/test_hashtable.py | 2 +- .../test_hashtable.py | 2 +- .../test_hashtable.py | 2 +- .../06_get_the_key_value_pairs/hashtable.py | 2 +- .../07_use_defensive_copying/hashtable.py | 2 +- .../08_get_the_keys_and_values/hashtable.py | 2 +- .../hashtable.py | 2 +- .../hashtable.py | 2 +- .../hashtable.py | 2 +- .../hashtable.py | 2 +- hashtable/02_linear_probing/hashtable.py | 2 +- hashtable/02_linear_probing/test_hashtable.py | 2 +- hashtable/03_autoresize/hashtable.py | 2 +- hashtable/03_autoresize/test_hashtable.py | 2 +- hashtable/04_load_factor/hashtable.py | 2 +- hashtable/04_load_factor/test_hashtable.py | 2 +- hashtable/05_separate_chaining/hashtable.py | 2 +- hashtable/06_insertion_order/hashtable.py | 2 +- histograms/histograms.py | 4 +-- .../pandas_search.py | 1 - .../regex_search.py | 1 - .../choosing/employees.py | 4 +-- .../choosing/program.py | 4 +-- .../composition/employees.py | 4 +-- .../composition/program.py | 4 +-- .../inheritance/employees.py | 4 +-- .../inheritance/program.py | 2 +- .../code-snippets/bokeh-template.py | 1 + .../code-snippets/east-top-2-race-v0.py | 4 +-- .../code-snippets/east-west-column-layout.py | 2 +- .../code-snippets/east-west-layout-prep.py | 2 +- .../code-snippets/east-west-tabbed-layout.py | 2 +- .../code-snippets/interactive-legend.py | 4 +-- intro-to-bokeh/code-snippets/linked-axes.py | 6 ++--- .../code-snippets/linked-selection.py | 6 ++--- .../code-snippets/selection-example.py | 2 +- .../code-snippets/west-top-2-race-v0.py | 2 +- .../code-snippets/west-top-2-race-v1.py | 4 +-- itertools-in-python3/sp500.py | 6 ++--- itertools-in-python3/swimmers.py | 2 +- .../tests/async_agent_requests.py | 4 +-- .../tests/sync_agent_requests.py | 4 +-- .../tests/async_agent_requests.py | 4 +-- .../tests/sync_agent_requests.py | 4 +-- mandelbrot-set-python/03_bw.py | 3 +-- mandelbrot-set-python/04_grayscale.py | 3 +-- mandelbrot-set-python/05_grayscale_smooth.py | 3 +-- mandelbrot-set-python/06_viewport_pixel.py | 4 +-- .../07_color_palette_matplotlib.py | 3 +-- .../08_color_palette_custom.py | 3 +-- mandelbrot-set-python/09_color_gradient.py | 3 +-- mandelbrot-set-python/10_color_hsb.py | 3 +-- mandelbrot-set-python/mandelbrot_03.py | 1 + mandelbrot-set-python/viewport.py | 1 + mvc-lego/create_db.py | 1 + nearbyshops/nearbyshops/urls.py | 2 +- nearbyshops/shops/admin.py | 1 + nearbyshops/shops/views.py | 5 ++-- nlp-sentiment-analysis/sentiment_analyzer.py | 5 ++-- numpy-rng/array_constraints.py | 2 +- numpy-rng/permutation_vs_shuffle.py | 1 - opencv-color-spaces/finding-nemo.py | 6 ++--- .../tutorial/__main__.py | 4 +-- .../01-loading-the-data.py | 2 ++ .../02-merging-dataframes.py | 2 ++ .../03-calculating-grades.py | 4 ++- .../04-grouping-the-data.py | 4 ++- .../05-plotting-summary-statistics.py | 6 +++-- .../06-final-gradebook.py | 6 +++-- .../data/generate_data.py | 10 ++++--- pep8-beautiful-code/trailing_whitespace.py | 2 +- primer-on-python-decorators/secret_app.py | 6 ++--- pygame-a-primer/py_tut_with_images.py | 10 +++---- pygame-a-primer/py_tutfinal.py | 8 +++--- pyproject.toml | 11 +++++++- python-311/ndarray.py | 3 +-- python-311/units.py | 1 - python-bindings/ctypes_c_test.py | 2 +- python-bindings/ctypes_cpp_test.py | 2 +- python-bindings/tasks.py | 14 +++++----- python-bitwise-operators/stegano/__main__.py | 4 +-- python-bitwise-operators/stegano/bitmap.py | 4 +-- python-class/point.py | 1 - .../source_code_final/rpcontacts/database.py | 2 +- .../source_code_step_3/rpcontacts/database.py | 2 +- .../source_code_step_4/rpcontacts/database.py | 2 +- .../source_code_step_5/rpcontacts/database.py | 2 +- .../source_code_step_6/rpcontacts/database.py | 2 +- python-ellipsis/ellipsis_example.py | 3 +-- python-ellipsis/flask_stub_example/app.py | 6 ++--- python-flask-example-heroku/app.py | 1 + .../create_large_dir.py | 1 - python-get-current-time/unix_time.py | 3 +-- python-get-current-time/with_time.py | 1 - python-heapq-module/shortest-path.py | 1 - python-http-server/https/self_signed.py | 2 +- .../finders_and_loaders/pip_importer.py | 2 +- python-import/optional_color/countdown.py | 3 ++- .../optional_color/optional_color.py | 2 +- .../full_code/test_football_pandas.py | 2 +- .../full_code/test_football_v1.py | 2 +- .../full_code/test_football_v2.py | 2 +- python-keyboard-input/sensitive.py | 2 +- .../src/maze_solver/view/primitives.py | 3 +-- .../src/maze_solver/view/primitives.py | 3 +-- .../src/maze_solver/view/primitives.py | 3 +-- .../marketplace/marketplace.py | 3 +-- .../marketplace/recommendations_pb2.py | 24 ++++++++--------- .../recommendations/recommendations.py | 5 ++-- .../recommendations/recommendations_pb2.py | 24 ++++++++--------- .../recommendations/recommendations_test.py | 1 - python-multiple-exceptions/error_codes.py | 2 +- .../07_image_processing/image_processing.py | 3 +-- .../image_processing_bonus.py | 3 +-- python-polars/downloads.py | 1 + python-polars/scanning_data.py | 1 + python-qr-code/scripts/animated_qrcode.py | 3 ++- .../source_code_final/quiz.py | 2 +- .../source_code_step_5/quiz.py | 2 +- python-requests/persist_info_with_session.py | 1 - .../cluster_sms_spam.py | 4 ++- .../minimize_constrained.py | 3 ++- .../minimize_scalar.py | 1 + python-self-type/accounts.py | 2 +- python-self-type/accounts_future_module.py | 3 ++- python-self-type/accounts_typevar.py | 2 +- python-self-type/stack_future_module.py | 1 + .../executable-code/code-objects/dill_demo.py | 2 +- .../executable-code/digital-signature/main.py | 2 +- .../executable-code/pickle-importable/main.py | 2 +- .../django-rest-api/project/urls.py | 1 + .../tabular-data/parquet-demo/main.py | 4 +-- python-sockets-tutorial/app-client.py | 4 +-- python-sockets-tutorial/app-server.py | 4 +-- python-sockets-tutorial/libclient.py | 6 ++--- python-sockets-tutorial/libserver.py | 6 ++--- python-sockets-tutorial/multiconn-client.py | 4 +-- python-sockets-tutorial/multiconn-server.py | 4 +-- python-split-list/parallel_demo.py | 1 - .../build_author_book_publisher_sqlite.py | 9 +++---- .../project/examples/example_2/main.py | 3 +-- .../examples/example_3/app/__init__.py | 13 +++++---- .../examples/example_3/app/albums/routes.py | 10 +++---- .../examples/example_3/app/artists/routes.py | 13 +++------ .../example_3/app/customers/routes.py | 11 +++----- .../example_3/app/employees/routes.py | 5 ++-- .../examples/example_3/app/invoices/routes.py | 5 ++-- .../project/examples/example_3/app/models.py | 3 ++- .../example_3/app/playlists/routes.py | 5 ++-- .../examples/example_3/app/tracks/routes.py | 27 ++++++++----------- .../examples/example_3/chinook_server.py | 1 - .../project/examples/example_3/config.py | 3 ++- .../project/modules/models.py | 4 +-- python-sqlite-sqlalchemy/setup.py | 2 +- python-type-checking/hearts.py | 15 ++++------- python-type-checking/parse.pyi | 2 +- .../06_type_aliases.py | 1 - python-wav-files/plot_oscilloscope.py | 1 - python-wav-files/plot_spectrogram.py | 1 - python-wav-files/plot_waveform.py | 1 - python-wav-files/stream.py | 1 - python-web-applications/main.py | 3 +-- python-yaml/formatter/server.py | 2 +- python-yaml/tree.py | 18 +++++++------ python-yaml/yaml2html.py | 6 ++--- qt-designer-python/sample_editor/app.py | 3 +-- queue/src/graph.py | 1 - replace-string-python/bad_json.py | 2 +- replace-string-python/bad_json_callback.py | 2 +- replace-string-python/transcript_reduce.py | 1 - .../transcript_regex_callback.py | 1 - requirements.txt | 4 +-- rp-portfolio/pages/urls.py | 1 + rp-portfolio/personal_portfolio/urls.py | 4 +-- rp-portfolio/projects/admin.py | 1 + rp-portfolio/projects/urls.py | 1 + rp-portfolio/projects/views.py | 1 + serverless-sms-service/app.py | 2 +- serverless-sms-service/chalicelib/sms.py | 1 + simulation-with-simpy/simulate.py | 3 ++- .../compare_sorting_dict_vs_list.py | 2 +- storing-images/storing_images.ipynb | 1 + storing-images/storing_images.py | 17 ++++++------ subprocess/create_project.py | 2 +- subprocess/error_handling.py | 1 - subprocess/random_num_gen_check_output.py | 1 - subprocess/reaction_game.py | 2 +- .../tic-tac-toe/frontends/browser/script.py | 4 +-- .../tic-tac-toe/frontends/console/args.py | 2 +- .../tic-tac-toe/frontends/play.py | 5 ++-- .../tic-tac-toe/frontends/play.py | 5 ++-- .../adventurelib/adventurelib_game.py | 15 +++++------ .../adventurelib/adventurelib_game_rooms.py | 6 ++--- top-python-game-engines/arcade/arcade_game.py | 6 ++--- top-python-game-engines/pygame/pygame_game.py | 8 +++--- .../pygame_zero/pygame_zero_game.py | 6 ++--- .../source_code_final/rptodo/__main__.py | 2 +- .../source_code_final/tests/test_rptodo.py | 4 +-- .../source_code_step_2/rptodo/__main__.py | 2 +- .../source_code_step_2/tests/test_rptodo.py | 3 +-- .../source_code_step_3/rptodo/__main__.py | 2 +- .../source_code_step_3/tests/test_rptodo.py | 3 +-- .../source_code_step_4/rptodo/__main__.py | 2 +- .../source_code_step_4/tests/test_rptodo.py | 3 +-- .../source_code_step_5/rptodo/__main__.py | 2 +- .../source_code_step_5/tests/test_rptodo.py | 3 +-- .../source_code_step_6/rptodo/__main__.py | 2 +- .../source_code_step_6/tests/test_rptodo.py | 3 +-- .../source_code_step_7/rptodo/__main__.py | 2 +- .../source_code_step_7/tests/test_rptodo.py | 3 +-- .../example_3.py | 3 ++- .../example_4.py | 1 + .../example_5.py | 1 + .../example_6.py | 1 + web-scraping-bs4/scrape_jobs.py | 1 - 543 files changed, 822 insertions(+), 801 deletions(-) diff --git a/.github/workflows/dircheck.py b/.github/workflows/dircheck.py index ebe8aebb7c..3153c4cef2 100644 --- a/.github/workflows/dircheck.py +++ b/.github/workflows/dircheck.py @@ -1,6 +1,7 @@ """ Linter to ensure standard folder structure """ + import pathlib import re import sys diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 2983f1f14c..19f8f01041 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: include: - - {name: Linux311, python: '3.11.5', os: ubuntu-latest} + - {name: Linux312, python: '3.12.3', os: ubuntu-latest} steps: - name: Check out repository uses: actions/checkout@v2 @@ -48,7 +48,7 @@ jobs: - name: Check code style run: | . venv/bin/activate - python -m flake8 + python -m ruff check . python -m black --check . - name: Check directory layout diff --git a/README.md b/README.md index a4f169fe5c..3acfe71543 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,12 @@ Due to time constraints, we cannot provide 1:1 support via GitHub. See you on Sl ### Running Code Style Checks -We use [flake8](http://flake8.pycqa.org/en/latest/) and [black](https://black.readthedocs.io/) to ensure a consistent code style for all of our sample code in this repository. +We use [ruff](https://docs.astral.sh/ruff/) and [black](https://black.readthedocs.io/) to ensure a consistent code style for all of our sample code in this repository. Run the following commands to validate your code against the linters: ```sh -$ flake8 +$ ruff check . $ black --check . ``` diff --git a/arcade-a-primer/arcade_game.py b/arcade-a-primer/arcade_game.py index 0012b5e66d..dcc96f5be4 100644 --- a/arcade-a-primer/arcade_game.py +++ b/arcade-a-primer/arcade_game.py @@ -2,9 +2,10 @@ # # Imports -import arcade import random +import arcade + # Constants SCREEN_WIDTH = 800 SCREEN_HEIGHT = 600 diff --git a/arcade-platformer/arcade_platformer/02_open_game_window.py b/arcade-platformer/arcade_platformer/02_open_game_window.py index e97ee8ffeb..efbc4d55d3 100644 --- a/arcade-platformer/arcade_platformer/02_open_game_window.py +++ b/arcade-platformer/arcade_platformer/02_open_game_window.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/03_read_level_one.py b/arcade-platformer/arcade_platformer/03_read_level_one.py index 7f3d414550..e31e8ce4d6 100644 --- a/arcade-platformer/arcade_platformer/03_read_level_one.py +++ b/arcade-platformer/arcade_platformer/03_read_level_one.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/04_define_player.py b/arcade-platformer/arcade_platformer/04_define_player.py index ac5ef297dd..1c4b3f9f23 100644 --- a/arcade-platformer/arcade_platformer/04_define_player.py +++ b/arcade-platformer/arcade_platformer/04_define_player.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/05_update_and_draw.py b/arcade-platformer/arcade_platformer/05_update_and_draw.py index 7505b467f0..e9d2c02451 100644 --- a/arcade-platformer/arcade_platformer/05_update_and_draw.py +++ b/arcade-platformer/arcade_platformer/05_update_and_draw.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/06_keyboard_movement.py b/arcade-platformer/arcade_platformer/06_keyboard_movement.py index 2ad09f2f80..d6b4248bb7 100644 --- a/arcade-platformer/arcade_platformer/06_keyboard_movement.py +++ b/arcade-platformer/arcade_platformer/06_keyboard_movement.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/07_scrolling_view.py b/arcade-platformer/arcade_platformer/07_scrolling_view.py index e921285151..92fa3a17c8 100644 --- a/arcade-platformer/arcade_platformer/07_scrolling_view.py +++ b/arcade-platformer/arcade_platformer/07_scrolling_view.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/08_on_screen_score.py b/arcade-platformer/arcade_platformer/08_on_screen_score.py index 0036b52afe..c04f79ad36 100644 --- a/arcade-platformer/arcade_platformer/08_on_screen_score.py +++ b/arcade-platformer/arcade_platformer/08_on_screen_score.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/09_joystick_control.py b/arcade-platformer/arcade_platformer/09_joystick_control.py index 6bf22e3879..74a1f7d5a3 100644 --- a/arcade-platformer/arcade_platformer/09_joystick_control.py +++ b/arcade-platformer/arcade_platformer/09_joystick_control.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/10_view_conversion.py b/arcade-platformer/arcade_platformer/10_view_conversion.py index 700b877dea..98379edaad 100644 --- a/arcade-platformer/arcade_platformer/10_view_conversion.py +++ b/arcade-platformer/arcade_platformer/10_view_conversion.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/11_title_view.py b/arcade-platformer/arcade_platformer/11_title_view.py index f0bd26bd73..b9e429d714 100644 --- a/arcade-platformer/arcade_platformer/11_title_view.py +++ b/arcade-platformer/arcade_platformer/11_title_view.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/12_instructions_view.py b/arcade-platformer/arcade_platformer/12_instructions_view.py index 77826ffaff..bec90cb9ae 100644 --- a/arcade-platformer/arcade_platformer/12_instructions_view.py +++ b/arcade-platformer/arcade_platformer/12_instructions_view.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/13_pause_view.py b/arcade-platformer/arcade_platformer/13_pause_view.py index 18aba65312..f469b8ce48 100644 --- a/arcade-platformer/arcade_platformer/13_pause_view.py +++ b/arcade-platformer/arcade_platformer/13_pause_view.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/14_enemies.py b/arcade-platformer/arcade_platformer/14_enemies.py index eb14f5c3b2..3b81adb91b 100644 --- a/arcade-platformer/arcade_platformer/14_enemies.py +++ b/arcade-platformer/arcade_platformer/14_enemies.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/15_moving_platforms.py b/arcade-platformer/arcade_platformer/15_moving_platforms.py index 130bd17c63..7020d5fb56 100644 --- a/arcade-platformer/arcade_platformer/15_moving_platforms.py +++ b/arcade-platformer/arcade_platformer/15_moving_platforms.py @@ -8,9 +8,10 @@ Game sounds and tile maps by author """ -import arcade import pathlib +import arcade + # Game constants # Window dimensions SCREEN_WIDTH = 1000 diff --git a/arcade-platformer/arcade_platformer/arcade_platformer.py b/arcade-platformer/arcade_platformer/arcade_platformer.py index 50b8777344..ec7e1e0a20 100644 --- a/arcade-platformer/arcade_platformer/arcade_platformer.py +++ b/arcade-platformer/arcade_platformer/arcade_platformer.py @@ -8,8 +8,9 @@ Game sounds and tile maps by author """ -import arcade import pathlib + +import arcade import constants as game # Assets path diff --git a/asterioids-pygame-project/source_code_final/space_rocks/__main__.py b/asterioids-pygame-project/source_code_final/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_final/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_final/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_final/space_rocks/game.py b/asterioids-pygame-project/source_code_final/space_rocks/game.py index 0cd6d2490c..74f4cada38 100644 --- a/asterioids-pygame-project/source_code_final/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_final/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import Asteroid, Spaceship from utils import get_random_position, load_sprite, print_text diff --git a/asterioids-pygame-project/source_code_final/space_rocks/models.py b/asterioids-pygame-project/source_code_final/space_rocks/models.py index c6d5ffb9ff..f68b5a334d 100644 --- a/asterioids-pygame-project/source_code_final/space_rocks/models.py +++ b/asterioids-pygame-project/source_code_final/space_rocks/models.py @@ -1,6 +1,5 @@ from pygame.math import Vector2 from pygame.transform import rotozoom - from utils import get_random_velocity, load_sound, load_sprite, wrap_position UP = Vector2(0, -1) diff --git a/asterioids-pygame-project/source_code_step_1/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_1/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_1/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_1/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_10/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_10/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_10/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_10/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_10/space_rocks/game.py b/asterioids-pygame-project/source_code_step_10/space_rocks/game.py index 0cd6d2490c..74f4cada38 100644 --- a/asterioids-pygame-project/source_code_step_10/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_10/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import Asteroid, Spaceship from utils import get_random_position, load_sprite, print_text diff --git a/asterioids-pygame-project/source_code_step_10/space_rocks/models.py b/asterioids-pygame-project/source_code_step_10/space_rocks/models.py index 44dbf46992..86c043a8c6 100644 --- a/asterioids-pygame-project/source_code_step_10/space_rocks/models.py +++ b/asterioids-pygame-project/source_code_step_10/space_rocks/models.py @@ -1,6 +1,5 @@ from pygame.math import Vector2 from pygame.transform import rotozoom - from utils import get_random_velocity, load_sound, load_sprite, wrap_position UP = Vector2(0, -1) diff --git a/asterioids-pygame-project/source_code_step_2/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_2/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_2/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_2/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_3/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_3/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_3/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_3/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_3/space_rocks/game.py b/asterioids-pygame-project/source_code_step_3/space_rocks/game.py index f87cde3750..603a42a871 100644 --- a/asterioids-pygame-project/source_code_step_3/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_3/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from utils import load_sprite diff --git a/asterioids-pygame-project/source_code_step_4/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_4/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_4/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_4/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_4/space_rocks/game.py b/asterioids-pygame-project/source_code_step_4/space_rocks/game.py index 0ab17def9a..e015b75452 100644 --- a/asterioids-pygame-project/source_code_step_4/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_4/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import GameObject from utils import load_sprite diff --git a/asterioids-pygame-project/source_code_step_5/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_5/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_5/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_5/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_5/space_rocks/game.py b/asterioids-pygame-project/source_code_step_5/space_rocks/game.py index 6c63804ad0..6eb83119f0 100644 --- a/asterioids-pygame-project/source_code_step_5/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_5/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import Spaceship from utils import load_sprite diff --git a/asterioids-pygame-project/source_code_step_5/space_rocks/models.py b/asterioids-pygame-project/source_code_step_5/space_rocks/models.py index 2a4647e638..f2fcd408ae 100644 --- a/asterioids-pygame-project/source_code_step_5/space_rocks/models.py +++ b/asterioids-pygame-project/source_code_step_5/space_rocks/models.py @@ -1,6 +1,5 @@ from pygame.math import Vector2 from pygame.transform import rotozoom - from utils import load_sprite, wrap_position UP = Vector2(0, -1) diff --git a/asterioids-pygame-project/source_code_step_6/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_6/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_6/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_6/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_6/space_rocks/game.py b/asterioids-pygame-project/source_code_step_6/space_rocks/game.py index 7cca677d72..11cd6f35b4 100644 --- a/asterioids-pygame-project/source_code_step_6/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_6/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import Asteroid, Spaceship from utils import get_random_position, load_sprite diff --git a/asterioids-pygame-project/source_code_step_6/space_rocks/models.py b/asterioids-pygame-project/source_code_step_6/space_rocks/models.py index 1a69875b60..bdbdd2020c 100644 --- a/asterioids-pygame-project/source_code_step_6/space_rocks/models.py +++ b/asterioids-pygame-project/source_code_step_6/space_rocks/models.py @@ -1,6 +1,5 @@ from pygame.math import Vector2 from pygame.transform import rotozoom - from utils import get_random_velocity, load_sprite, wrap_position UP = Vector2(0, -1) diff --git a/asterioids-pygame-project/source_code_step_7/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_7/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_7/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_7/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_7/space_rocks/game.py b/asterioids-pygame-project/source_code_step_7/space_rocks/game.py index 9c7fb5b9e9..c420b48dd1 100644 --- a/asterioids-pygame-project/source_code_step_7/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_7/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import Asteroid, Spaceship from utils import get_random_position, load_sprite diff --git a/asterioids-pygame-project/source_code_step_7/space_rocks/models.py b/asterioids-pygame-project/source_code_step_7/space_rocks/models.py index 7c649ef3c7..310584fe22 100644 --- a/asterioids-pygame-project/source_code_step_7/space_rocks/models.py +++ b/asterioids-pygame-project/source_code_step_7/space_rocks/models.py @@ -1,6 +1,5 @@ from pygame.math import Vector2 from pygame.transform import rotozoom - from utils import get_random_velocity, load_sprite, wrap_position UP = Vector2(0, -1) diff --git a/asterioids-pygame-project/source_code_step_8/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_8/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_8/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_8/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_8/space_rocks/game.py b/asterioids-pygame-project/source_code_step_8/space_rocks/game.py index 9d09e73312..fd84166e44 100644 --- a/asterioids-pygame-project/source_code_step_8/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_8/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import Asteroid, Spaceship from utils import get_random_position, load_sprite diff --git a/asterioids-pygame-project/source_code_step_8/space_rocks/models.py b/asterioids-pygame-project/source_code_step_8/space_rocks/models.py index 08cb27dc9c..e514f74872 100644 --- a/asterioids-pygame-project/source_code_step_8/space_rocks/models.py +++ b/asterioids-pygame-project/source_code_step_8/space_rocks/models.py @@ -1,6 +1,5 @@ from pygame.math import Vector2 from pygame.transform import rotozoom - from utils import get_random_velocity, load_sprite, wrap_position UP = Vector2(0, -1) diff --git a/asterioids-pygame-project/source_code_step_9/space_rocks/__main__.py b/asterioids-pygame-project/source_code_step_9/space_rocks/__main__.py index 1f2521da0e..619b3e94d8 100644 --- a/asterioids-pygame-project/source_code_step_9/space_rocks/__main__.py +++ b/asterioids-pygame-project/source_code_step_9/space_rocks/__main__.py @@ -1,6 +1,5 @@ from game import SpaceRocks - if __name__ == "__main__": space_rocks = SpaceRocks() space_rocks.main_loop() diff --git a/asterioids-pygame-project/source_code_step_9/space_rocks/game.py b/asterioids-pygame-project/source_code_step_9/space_rocks/game.py index 9d09e73312..fd84166e44 100644 --- a/asterioids-pygame-project/source_code_step_9/space_rocks/game.py +++ b/asterioids-pygame-project/source_code_step_9/space_rocks/game.py @@ -1,5 +1,4 @@ import pygame - from models import Asteroid, Spaceship from utils import get_random_position, load_sprite diff --git a/asterioids-pygame-project/source_code_step_9/space_rocks/models.py b/asterioids-pygame-project/source_code_step_9/space_rocks/models.py index 44dbf46992..86c043a8c6 100644 --- a/asterioids-pygame-project/source_code_step_9/space_rocks/models.py +++ b/asterioids-pygame-project/source_code_step_9/space_rocks/models.py @@ -1,6 +1,5 @@ from pygame.math import Vector2 from pygame.transform import rotozoom - from utils import get_random_velocity, load_sound, load_sprite, wrap_position UP = Vector2(0, -1) diff --git a/asyncio-walkthrough/areq.py b/asyncio-walkthrough/areq.py index e5b1871a58..12ae0cde14 100644 --- a/asyncio-walkthrough/areq.py +++ b/asyncio-walkthrough/areq.py @@ -7,9 +7,9 @@ import logging import re import sys -from typing import IO import urllib.error import urllib.parse +from typing import IO import aiofiles import aiohttp diff --git a/binary-search/benchmark.py b/binary-search/benchmark.py index 1f9eb704c4..c2743e4915 100644 --- a/binary-search/benchmark.py +++ b/binary-search/benchmark.py @@ -16,8 +16,8 @@ from typing import List from search.binary import find_index as binary_search -from search.random import find_index as random_search from search.linear import find_index as linear_search +from search.random import find_index as random_search def main(args: argparse.Namespace) -> None: diff --git a/binary-search/download_imdb.py b/binary-search/download_imdb.py index fd54aff3b7..45a97f4171 100644 --- a/binary-search/download_imdb.py +++ b/binary-search/download_imdb.py @@ -22,9 +22,10 @@ def main(): with open("names.txt", "w", encoding="utf-8") as destination: destination.writelines(names()) - with open("names.txt", encoding="utf-8") as source, open( - "sorted_names.txt", "w", encoding="utf-8" - ) as destination: + with ( + open("names.txt", encoding="utf-8") as source, + open("sorted_names.txt", "w", encoding="utf-8") as destination, + ): destination.writelines(sorted(source.readlines())) print('Created "names.txt" and "sorted_names.txt"') diff --git a/binary-search/search/binary.py b/binary-search/search/binary.py index 31a88bfde2..0dd6a2d80c 100644 --- a/binary-search/search/binary.py +++ b/binary-search/search/binary.py @@ -2,9 +2,9 @@ The binary search algorithm. """ -from typing import Optional, Set, Sequence +from typing import Optional, Sequence, Set -from search import T, S, Key, identity +from search import Key, S, T, identity def find_index( diff --git a/binary-search/search/linear.py b/binary-search/search/linear.py index 99b4b8376d..facf5a0dbe 100644 --- a/binary-search/search/linear.py +++ b/binary-search/search/linear.py @@ -4,7 +4,7 @@ from typing import Optional, Sequence -from search import T, S, Key, identity +from search import Key, S, T, identity def find_index( diff --git a/binary-search/search/random.py b/binary-search/search/random.py index fc4f96a3ce..6f7106d419 100644 --- a/binary-search/search/random.py +++ b/binary-search/search/random.py @@ -3,9 +3,9 @@ """ import random -from typing import Optional, Set, Sequence +from typing import Optional, Sequence, Set -from search import T, S, Key, identity +from search import Key, S, T, identity def find_index( diff --git a/brython/base64/form/main.py b/brython/base64/form/main.py index 7499a3f8b0..e413d2cd0b 100644 --- a/brython/base64/form/main.py +++ b/brython/base64/form/main.py @@ -1,6 +1,7 @@ -from browser import document, html, alert import base64 +from browser import alert, document, html + b64_map = {} diff --git a/brython/base64/sep/main.py b/brython/base64/sep/main.py index badcda479b..438aa604d9 100644 --- a/brython/base64/sep/main.py +++ b/brython/base64/sep/main.py @@ -1,6 +1,7 @@ -from browser import document, prompt, html # type: ignore import base64 +from browser import document, html, prompt # type: ignore + b64_map = {} diff --git a/brython/base64/storage/main.py b/brython/base64/storage/main.py index e43ecad9bc..3bf7d00967 100644 --- a/brython/base64/storage/main.py +++ b/brython/base64/storage/main.py @@ -1,7 +1,8 @@ -from browser import document, html, alert -from browser.local_storage import storage -import json import base64 +import json + +from browser import alert, document, html +from browser.local_storage import storage def load_data(): diff --git a/brython/base64/storage_perf/main.py b/brython/base64/storage_perf/main.py index aed660db0d..ac3de66b43 100644 --- a/brython/base64/storage_perf/main.py +++ b/brython/base64/storage_perf/main.py @@ -1,7 +1,8 @@ -from browser import document, html, alert -from browser.local_storage import storage import base64 +from browser import alert, document, html +from browser.local_storage import storage + def load_data(): b64_map = {} diff --git a/brython/hashes/main.py b/brython/hashes/main.py index 5d5713a1d9..c3207b2a0f 100644 --- a/brython/hashes/main.py +++ b/brython/hashes/main.py @@ -1,6 +1,7 @@ -from browser import document, html, alert import hashlib +from browser import alert, document, html + hashes = { "sha-1": hashlib.sha1, "sha-256": hashlib.sha256, diff --git a/brython/sha256/main.py b/brython/sha256/main.py index 32c06ffa76..a602187357 100644 --- a/brython/sha256/main.py +++ b/brython/sha256/main.py @@ -1,7 +1,8 @@ -from browser import document, html, alert -from browser.local_storage import storage -import json import hashlib +import json + +from browser import alert, document, html +from browser.local_storage import storage LOCAL_STORAGE = "hashdata" diff --git a/brython/vuejs/main.py b/brython/vuejs/main.py index c70b8ddf91..26632a9fbb 100644 --- a/brython/vuejs/main.py +++ b/brython/vuejs/main.py @@ -1,6 +1,7 @@ +import hashlib + from browser import alert, window from javascript import this -import hashlib hashes = { "sha-1": hashlib.sha1, diff --git a/build-a-blog-from-scratch-django/django-blog/blog/admin.py b/build-a-blog-from-scratch-django/django-blog/blog/admin.py index 14b0918994..18a68deed8 100644 --- a/build-a-blog-from-scratch-django/django-blog/blog/admin.py +++ b/build-a-blog-from-scratch-django/django-blog/blog/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from blog.models import Category, Comment, Post diff --git a/build-a-blog-from-scratch-django/django-blog/blog/urls.py b/build-a-blog-from-scratch-django/django-blog/blog/urls.py index 5fb62222cb..5ecf695038 100644 --- a/build-a-blog-from-scratch-django/django-blog/blog/urls.py +++ b/build-a-blog-from-scratch-django/django-blog/blog/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from . import views urlpatterns = [ diff --git a/build-a-blog-from-scratch-django/django-blog/personal_blog/urls.py b/build-a-blog-from-scratch-django/django-blog/personal_blog/urls.py index 948559b782..d343e4a05d 100644 --- a/build-a-blog-from-scratch-django/django-blog/personal_blog/urls.py +++ b/build-a-blog-from-scratch-django/django-blog/personal_blog/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/build-a-django-content-aggregator/source_code_final/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_final/content_aggregator/urls.py index e6a4c747d3..55ae6ca2d9 100644 --- a/build-a-django-content-aggregator/source_code_final/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_final/content_aggregator/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/build-a-django-content-aggregator/source_code_final/podcasts/management/commands/startjobs.py b/build-a-django-content-aggregator/source_code_final/podcasts/management/commands/startjobs.py index 8e93d63e7e..0c0a3b43d2 100644 --- a/build-a-django-content-aggregator/source_code_final/podcasts/management/commands/startjobs.py +++ b/build-a-django-content-aggregator/source_code_final/podcasts/management/commands/startjobs.py @@ -1,22 +1,21 @@ # Standard Library import logging -# Django -from django.conf import settings -from django.core.management.base import BaseCommand - # Third Party import feedparser -from dateutil import parser from apscheduler.schedulers.blocking import BlockingScheduler from apscheduler.triggers.cron import CronTrigger +from dateutil import parser + +# Django +from django.conf import settings +from django.core.management.base import BaseCommand from django_apscheduler.jobstores import DjangoJobStore from django_apscheduler.models import DjangoJobExecution # Models from podcasts.models import Episode - logger = logging.getLogger(__name__) diff --git a/build-a-django-content-aggregator/source_code_final/podcasts/tests.py b/build-a-django-content-aggregator/source_code_final/podcasts/tests.py index f6aabe9c45..d00df920e0 100644 --- a/build-a-django-content-aggregator/source_code_final/podcasts/tests.py +++ b/build-a-django-content-aggregator/source_code_final/podcasts/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase -from django.utils import timezone from django.urls.base import reverse +from django.utils import timezone from .models import Episode diff --git a/build-a-django-content-aggregator/source_code_final/podcasts/urls.py b/build-a-django-content-aggregator/source_code_final/podcasts/urls.py index a5a8385ebb..41f111804d 100644 --- a/build-a-django-content-aggregator/source_code_final/podcasts/urls.py +++ b/build-a-django-content-aggregator/source_code_final/podcasts/urls.py @@ -2,7 +2,6 @@ from .views import HomePageView - urlpatterns = [ path("", HomePageView.as_view(), name="homepage"), ] diff --git a/build-a-django-content-aggregator/source_code_step_1/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_step_1/content_aggregator/urls.py index 52c3557553..06821ce4ad 100644 --- a/build-a-django-content-aggregator/source_code_step_1/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_step_1/content_aggregator/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/build-a-django-content-aggregator/source_code_step_2/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_step_2/content_aggregator/urls.py index 52c3557553..06821ce4ad 100644 --- a/build-a-django-content-aggregator/source_code_step_2/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_step_2/content_aggregator/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/build-a-django-content-aggregator/source_code_step_2/podcasts/tests.py b/build-a-django-content-aggregator/source_code_step_2/podcasts/tests.py index 1805a8be23..0c7584b92a 100644 --- a/build-a-django-content-aggregator/source_code_step_2/podcasts/tests.py +++ b/build-a-django-content-aggregator/source_code_step_2/podcasts/tests.py @@ -1,5 +1,6 @@ from django.test import TestCase from django.utils import timezone + from .models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_3/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_step_3/content_aggregator/urls.py index e6a4c747d3..55ae6ca2d9 100644 --- a/build-a-django-content-aggregator/source_code_step_3/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_step_3/content_aggregator/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/build-a-django-content-aggregator/source_code_step_3/podcasts/tests.py b/build-a-django-content-aggregator/source_code_step_3/podcasts/tests.py index f6aabe9c45..d00df920e0 100644 --- a/build-a-django-content-aggregator/source_code_step_3/podcasts/tests.py +++ b/build-a-django-content-aggregator/source_code_step_3/podcasts/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase -from django.utils import timezone from django.urls.base import reverse +from django.utils import timezone from .models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_3/podcasts/urls.py b/build-a-django-content-aggregator/source_code_step_3/podcasts/urls.py index a5a8385ebb..41f111804d 100644 --- a/build-a-django-content-aggregator/source_code_step_3/podcasts/urls.py +++ b/build-a-django-content-aggregator/source_code_step_3/podcasts/urls.py @@ -2,7 +2,6 @@ from .views import HomePageView - urlpatterns = [ path("", HomePageView.as_view(), name="homepage"), ] diff --git a/build-a-django-content-aggregator/source_code_step_4/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_step_4/content_aggregator/urls.py index e6a4c747d3..55ae6ca2d9 100644 --- a/build-a-django-content-aggregator/source_code_step_4/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_step_4/content_aggregator/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/build-a-django-content-aggregator/source_code_step_4/podcasts/tests.py b/build-a-django-content-aggregator/source_code_step_4/podcasts/tests.py index f6aabe9c45..d00df920e0 100644 --- a/build-a-django-content-aggregator/source_code_step_4/podcasts/tests.py +++ b/build-a-django-content-aggregator/source_code_step_4/podcasts/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase -from django.utils import timezone from django.urls.base import reverse +from django.utils import timezone from .models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_4/podcasts/urls.py b/build-a-django-content-aggregator/source_code_step_4/podcasts/urls.py index a5a8385ebb..41f111804d 100644 --- a/build-a-django-content-aggregator/source_code_step_4/podcasts/urls.py +++ b/build-a-django-content-aggregator/source_code_step_4/podcasts/urls.py @@ -2,7 +2,6 @@ from .views import HomePageView - urlpatterns = [ path("", HomePageView.as_view(), name="homepage"), ] diff --git a/build-a-django-content-aggregator/source_code_step_5/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_step_5/content_aggregator/urls.py index e6a4c747d3..55ae6ca2d9 100644 --- a/build-a-django-content-aggregator/source_code_step_5/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_step_5/content_aggregator/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/build-a-django-content-aggregator/source_code_step_5/podcasts/management/commands/startjobs.py b/build-a-django-content-aggregator/source_code_step_5/podcasts/management/commands/startjobs.py index 3ec09541f9..90550de7b5 100644 --- a/build-a-django-content-aggregator/source_code_step_5/podcasts/management/commands/startjobs.py +++ b/build-a-django-content-aggregator/source_code_step_5/podcasts/management/commands/startjobs.py @@ -1,8 +1,6 @@ -from django.core.management.base import BaseCommand - import feedparser from dateutil import parser - +from django.core.management.base import BaseCommand from podcasts.models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_5/podcasts/tests.py b/build-a-django-content-aggregator/source_code_step_5/podcasts/tests.py index f6aabe9c45..d00df920e0 100644 --- a/build-a-django-content-aggregator/source_code_step_5/podcasts/tests.py +++ b/build-a-django-content-aggregator/source_code_step_5/podcasts/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase -from django.utils import timezone from django.urls.base import reverse +from django.utils import timezone from .models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_5/podcasts/urls.py b/build-a-django-content-aggregator/source_code_step_5/podcasts/urls.py index a5a8385ebb..41f111804d 100644 --- a/build-a-django-content-aggregator/source_code_step_5/podcasts/urls.py +++ b/build-a-django-content-aggregator/source_code_step_5/podcasts/urls.py @@ -2,7 +2,6 @@ from .views import HomePageView - urlpatterns = [ path("", HomePageView.as_view(), name="homepage"), ] diff --git a/build-a-django-content-aggregator/source_code_step_6/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_step_6/content_aggregator/urls.py index e6a4c747d3..55ae6ca2d9 100644 --- a/build-a-django-content-aggregator/source_code_step_6/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_step_6/content_aggregator/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/build-a-django-content-aggregator/source_code_step_6/podcasts/management/commands/startjobs.py b/build-a-django-content-aggregator/source_code_step_6/podcasts/management/commands/startjobs.py index e1c0eb116e..b37d7ec182 100644 --- a/build-a-django-content-aggregator/source_code_step_6/podcasts/management/commands/startjobs.py +++ b/build-a-django-content-aggregator/source_code_step_6/podcasts/management/commands/startjobs.py @@ -1,8 +1,6 @@ -from django.core.management.base import BaseCommand - import feedparser from dateutil import parser - +from django.core.management.base import BaseCommand from podcasts.models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_6/podcasts/tests.py b/build-a-django-content-aggregator/source_code_step_6/podcasts/tests.py index f6aabe9c45..d00df920e0 100644 --- a/build-a-django-content-aggregator/source_code_step_6/podcasts/tests.py +++ b/build-a-django-content-aggregator/source_code_step_6/podcasts/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase -from django.utils import timezone from django.urls.base import reverse +from django.utils import timezone from .models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_6/podcasts/urls.py b/build-a-django-content-aggregator/source_code_step_6/podcasts/urls.py index a5a8385ebb..41f111804d 100644 --- a/build-a-django-content-aggregator/source_code_step_6/podcasts/urls.py +++ b/build-a-django-content-aggregator/source_code_step_6/podcasts/urls.py @@ -2,7 +2,6 @@ from .views import HomePageView - urlpatterns = [ path("", HomePageView.as_view(), name="homepage"), ] diff --git a/build-a-django-content-aggregator/source_code_step_7/content_aggregator/urls.py b/build-a-django-content-aggregator/source_code_step_7/content_aggregator/urls.py index e6a4c747d3..55ae6ca2d9 100644 --- a/build-a-django-content-aggregator/source_code_step_7/content_aggregator/urls.py +++ b/build-a-django-content-aggregator/source_code_step_7/content_aggregator/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/build-a-django-content-aggregator/source_code_step_7/podcasts/management/commands/startjobs.py b/build-a-django-content-aggregator/source_code_step_7/podcasts/management/commands/startjobs.py index 8e93d63e7e..0c0a3b43d2 100644 --- a/build-a-django-content-aggregator/source_code_step_7/podcasts/management/commands/startjobs.py +++ b/build-a-django-content-aggregator/source_code_step_7/podcasts/management/commands/startjobs.py @@ -1,22 +1,21 @@ # Standard Library import logging -# Django -from django.conf import settings -from django.core.management.base import BaseCommand - # Third Party import feedparser -from dateutil import parser from apscheduler.schedulers.blocking import BlockingScheduler from apscheduler.triggers.cron import CronTrigger +from dateutil import parser + +# Django +from django.conf import settings +from django.core.management.base import BaseCommand from django_apscheduler.jobstores import DjangoJobStore from django_apscheduler.models import DjangoJobExecution # Models from podcasts.models import Episode - logger = logging.getLogger(__name__) diff --git a/build-a-django-content-aggregator/source_code_step_7/podcasts/tests.py b/build-a-django-content-aggregator/source_code_step_7/podcasts/tests.py index f6aabe9c45..d00df920e0 100644 --- a/build-a-django-content-aggregator/source_code_step_7/podcasts/tests.py +++ b/build-a-django-content-aggregator/source_code_step_7/podcasts/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase -from django.utils import timezone from django.urls.base import reverse +from django.utils import timezone from .models import Episode diff --git a/build-a-django-content-aggregator/source_code_step_7/podcasts/urls.py b/build-a-django-content-aggregator/source_code_step_7/podcasts/urls.py index a5a8385ebb..41f111804d 100644 --- a/build-a-django-content-aggregator/source_code_step_7/podcasts/urls.py +++ b/build-a-django-content-aggregator/source_code_step_7/podcasts/urls.py @@ -2,7 +2,6 @@ from .views import HomePageView - urlpatterns = [ path("", HomePageView.as_view(), name="homepage"), ] diff --git a/build-a-gui-with-wxpython/mp3_tag_editor.py b/build-a-gui-with-wxpython/mp3_tag_editor.py index 155a318d99..6147140438 100644 --- a/build-a-gui-with-wxpython/mp3_tag_editor.py +++ b/build-a-gui-with-wxpython/mp3_tag_editor.py @@ -1,5 +1,6 @@ -import eyed3 import glob + +import eyed3 import wx diff --git a/build-a-rest-api-frontend/source_code_final/app.py b/build-a-rest-api-frontend/source_code_final/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_final/app.py +++ b/build-a-rest-api-frontend/source_code_final/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_final/init_database.py b/build-a-rest-api-frontend/source_code_final/init_database.py index 6b85480780..0f1d4c59df 100644 --- a/build-a-rest-api-frontend/source_code_final/init_database.py +++ b/build-a-rest-api-frontend/source_code_final/init_database.py @@ -1,8 +1,8 @@ from datetime import datetime -from sqlalchemy.exc import OperationalError from config import app, db from models import Note, Person +from sqlalchemy.exc import OperationalError PEOPLE_NOTES = [ { diff --git a/build-a-rest-api-frontend/source_code_final/models.py b/build-a-rest-api-frontend/source_code_final/models.py index 1613e612bf..bfd39c5ba9 100644 --- a/build-a-rest-api-frontend/source_code_final/models.py +++ b/build-a-rest-api-frontend/source_code_final/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_final/notes.py b/build-a-rest-api-frontend/source_code_final/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_final/notes.py +++ b/build-a-rest-api-frontend/source_code_final/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_final/people.py b/build-a-rest-api-frontend/source_code_final/people.py index 93d93ad8b9..f2fe3533bf 100644 --- a/build-a-rest-api-frontend/source_code_final/people.py +++ b/build-a-rest-api-frontend/source_code_final/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/build-a-rest-api-frontend/source_code_final_before/app.py b/build-a-rest-api-frontend/source_code_final_before/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_final_before/app.py +++ b/build-a-rest-api-frontend/source_code_final_before/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_final_before/models.py b/build-a-rest-api-frontend/source_code_final_before/models.py index cc1e8ba7a2..e39755f282 100644 --- a/build-a-rest-api-frontend/source_code_final_before/models.py +++ b/build-a-rest-api-frontend/source_code_final_before/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_final_before/notes.py b/build-a-rest-api-frontend/source_code_final_before/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_final_before/notes.py +++ b/build-a-rest-api-frontend/source_code_final_before/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_final_before/people.py b/build-a-rest-api-frontend/source_code_final_before/people.py index d71f404a37..eb6492fb10 100644 --- a/build-a-rest-api-frontend/source_code_final_before/people.py +++ b/build-a-rest-api-frontend/source_code_final_before/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/build-a-rest-api-frontend/source_code_start/app.py b/build-a-rest-api-frontend/source_code_start/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_start/app.py +++ b/build-a-rest-api-frontend/source_code_start/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_start/init_database.py b/build-a-rest-api-frontend/source_code_start/init_database.py index 6b85480780..0f1d4c59df 100644 --- a/build-a-rest-api-frontend/source_code_start/init_database.py +++ b/build-a-rest-api-frontend/source_code_start/init_database.py @@ -1,8 +1,8 @@ from datetime import datetime -from sqlalchemy.exc import OperationalError from config import app, db from models import Note, Person +from sqlalchemy.exc import OperationalError PEOPLE_NOTES = [ { diff --git a/build-a-rest-api-frontend/source_code_start/models.py b/build-a-rest-api-frontend/source_code_start/models.py index 273cd88889..e636812804 100644 --- a/build-a-rest-api-frontend/source_code_start/models.py +++ b/build-a-rest-api-frontend/source_code_start/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_start/notes.py b/build-a-rest-api-frontend/source_code_start/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_start/notes.py +++ b/build-a-rest-api-frontend/source_code_start/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_start/people.py b/build-a-rest-api-frontend/source_code_start/people.py index dfc2060910..49ae7ec950 100644 --- a/build-a-rest-api-frontend/source_code_start/people.py +++ b/build-a-rest-api-frontend/source_code_start/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/build-a-rest-api-frontend/source_code_step_1/app.py b/build-a-rest-api-frontend/source_code_step_1/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_step_1/app.py +++ b/build-a-rest-api-frontend/source_code_step_1/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_step_1/init_database.py b/build-a-rest-api-frontend/source_code_step_1/init_database.py index 6b85480780..0f1d4c59df 100644 --- a/build-a-rest-api-frontend/source_code_step_1/init_database.py +++ b/build-a-rest-api-frontend/source_code_step_1/init_database.py @@ -1,8 +1,8 @@ from datetime import datetime -from sqlalchemy.exc import OperationalError from config import app, db from models import Note, Person +from sqlalchemy.exc import OperationalError PEOPLE_NOTES = [ { diff --git a/build-a-rest-api-frontend/source_code_step_1/models.py b/build-a-rest-api-frontend/source_code_step_1/models.py index 1613e612bf..bfd39c5ba9 100644 --- a/build-a-rest-api-frontend/source_code_step_1/models.py +++ b/build-a-rest-api-frontend/source_code_step_1/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_step_1/notes.py b/build-a-rest-api-frontend/source_code_step_1/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_step_1/notes.py +++ b/build-a-rest-api-frontend/source_code_step_1/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_step_1/people.py b/build-a-rest-api-frontend/source_code_step_1/people.py index 93d93ad8b9..f2fe3533bf 100644 --- a/build-a-rest-api-frontend/source_code_step_1/people.py +++ b/build-a-rest-api-frontend/source_code_step_1/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/build-a-rest-api-frontend/source_code_step_2/app.py b/build-a-rest-api-frontend/source_code_step_2/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_step_2/app.py +++ b/build-a-rest-api-frontend/source_code_step_2/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_step_2/init_database.py b/build-a-rest-api-frontend/source_code_step_2/init_database.py index 6b85480780..0f1d4c59df 100644 --- a/build-a-rest-api-frontend/source_code_step_2/init_database.py +++ b/build-a-rest-api-frontend/source_code_step_2/init_database.py @@ -1,8 +1,8 @@ from datetime import datetime -from sqlalchemy.exc import OperationalError from config import app, db from models import Note, Person +from sqlalchemy.exc import OperationalError PEOPLE_NOTES = [ { diff --git a/build-a-rest-api-frontend/source_code_step_2/models.py b/build-a-rest-api-frontend/source_code_step_2/models.py index 1613e612bf..bfd39c5ba9 100644 --- a/build-a-rest-api-frontend/source_code_step_2/models.py +++ b/build-a-rest-api-frontend/source_code_step_2/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_step_2/notes.py b/build-a-rest-api-frontend/source_code_step_2/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_step_2/notes.py +++ b/build-a-rest-api-frontend/source_code_step_2/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_step_2/people.py b/build-a-rest-api-frontend/source_code_step_2/people.py index 93d93ad8b9..f2fe3533bf 100644 --- a/build-a-rest-api-frontend/source_code_step_2/people.py +++ b/build-a-rest-api-frontend/source_code_step_2/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/build-a-rest-api-frontend/source_code_step_3/app.py b/build-a-rest-api-frontend/source_code_step_3/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_step_3/app.py +++ b/build-a-rest-api-frontend/source_code_step_3/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_step_3/init_database.py b/build-a-rest-api-frontend/source_code_step_3/init_database.py index 6b85480780..0f1d4c59df 100644 --- a/build-a-rest-api-frontend/source_code_step_3/init_database.py +++ b/build-a-rest-api-frontend/source_code_step_3/init_database.py @@ -1,8 +1,8 @@ from datetime import datetime -from sqlalchemy.exc import OperationalError from config import app, db from models import Note, Person +from sqlalchemy.exc import OperationalError PEOPLE_NOTES = [ { diff --git a/build-a-rest-api-frontend/source_code_step_3/models.py b/build-a-rest-api-frontend/source_code_step_3/models.py index 1613e612bf..bfd39c5ba9 100644 --- a/build-a-rest-api-frontend/source_code_step_3/models.py +++ b/build-a-rest-api-frontend/source_code_step_3/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_step_3/notes.py b/build-a-rest-api-frontend/source_code_step_3/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_step_3/notes.py +++ b/build-a-rest-api-frontend/source_code_step_3/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_step_3/people.py b/build-a-rest-api-frontend/source_code_step_3/people.py index 93d93ad8b9..f2fe3533bf 100644 --- a/build-a-rest-api-frontend/source_code_step_3/people.py +++ b/build-a-rest-api-frontend/source_code_step_3/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/build-a-rest-api-frontend/source_code_step_4/app.py b/build-a-rest-api-frontend/source_code_step_4/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_step_4/app.py +++ b/build-a-rest-api-frontend/source_code_step_4/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_step_4/init_database.py b/build-a-rest-api-frontend/source_code_step_4/init_database.py index 6b85480780..0f1d4c59df 100644 --- a/build-a-rest-api-frontend/source_code_step_4/init_database.py +++ b/build-a-rest-api-frontend/source_code_step_4/init_database.py @@ -1,8 +1,8 @@ from datetime import datetime -from sqlalchemy.exc import OperationalError from config import app, db from models import Note, Person +from sqlalchemy.exc import OperationalError PEOPLE_NOTES = [ { diff --git a/build-a-rest-api-frontend/source_code_step_4/models.py b/build-a-rest-api-frontend/source_code_step_4/models.py index 1613e612bf..bfd39c5ba9 100644 --- a/build-a-rest-api-frontend/source_code_step_4/models.py +++ b/build-a-rest-api-frontend/source_code_step_4/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_step_4/notes.py b/build-a-rest-api-frontend/source_code_step_4/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_step_4/notes.py +++ b/build-a-rest-api-frontend/source_code_step_4/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_step_4/people.py b/build-a-rest-api-frontend/source_code_step_4/people.py index 93d93ad8b9..f2fe3533bf 100644 --- a/build-a-rest-api-frontend/source_code_step_4/people.py +++ b/build-a-rest-api-frontend/source_code_step_4/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/build-a-rest-api-frontend/source_code_step_5/app.py b/build-a-rest-api-frontend/source_code_step_5/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/build-a-rest-api-frontend/source_code_step_5/app.py +++ b/build-a-rest-api-frontend/source_code_step_5/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/build-a-rest-api-frontend/source_code_step_5/init_database.py b/build-a-rest-api-frontend/source_code_step_5/init_database.py index 6b85480780..0f1d4c59df 100644 --- a/build-a-rest-api-frontend/source_code_step_5/init_database.py +++ b/build-a-rest-api-frontend/source_code_step_5/init_database.py @@ -1,8 +1,8 @@ from datetime import datetime -from sqlalchemy.exc import OperationalError from config import app, db from models import Note, Person +from sqlalchemy.exc import OperationalError PEOPLE_NOTES = [ { diff --git a/build-a-rest-api-frontend/source_code_step_5/models.py b/build-a-rest-api-frontend/source_code_step_5/models.py index 1613e612bf..bfd39c5ba9 100644 --- a/build-a-rest-api-frontend/source_code_step_5/models.py +++ b/build-a-rest-api-frontend/source_code_step_5/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/build-a-rest-api-frontend/source_code_step_5/notes.py b/build-a-rest-api-frontend/source_code_step_5/notes.py index f02f0b2d0a..96763dee07 100644 --- a/build-a-rest-api-frontend/source_code_step_5/notes.py +++ b/build-a-rest-api-frontend/source_code_step_5/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/build-a-rest-api-frontend/source_code_step_5/people.py b/build-a-rest-api-frontend/source_code_step_5/people.py index 93d93ad8b9..f2fe3533bf 100644 --- a/build-a-rest-api-frontend/source_code_step_5/people.py +++ b/build-a-rest-api-frontend/source_code_step_5/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/celery-async-tasks/source_code_final/django_celery/urls.py b/celery-async-tasks/source_code_final/django_celery/urls.py index 497906ddda..b20104c0c0 100644 --- a/celery-async-tasks/source_code_final/django_celery/urls.py +++ b/celery-async-tasks/source_code_final/django_celery/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import include, path diff --git a/celery-async-tasks/source_code_initial/django_celery/urls.py b/celery-async-tasks/source_code_initial/django_celery/urls.py index 497906ddda..b20104c0c0 100644 --- a/celery-async-tasks/source_code_initial/django_celery/urls.py +++ b/celery-async-tasks/source_code_initial/django_celery/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import include, path diff --git a/chatgpt-mentor/fizzbuzz_chatgpt_option_2.py b/chatgpt-mentor/fizzbuzz_chatgpt_option_2.py index bcc742a293..6d3574ad04 100644 --- a/chatgpt-mentor/fizzbuzz_chatgpt_option_2.py +++ b/chatgpt-mentor/fizzbuzz_chatgpt_option_2.py @@ -1,12 +1,10 @@ def fizzbuzz(n): result = [ - "fizz buzz" - if i % 15 == 0 - else "fizz" - if i % 3 == 0 - else "buzz" - if i % 5 == 0 - else i + ( + "fizz buzz" + if i % 15 == 0 + else "fizz" if i % 3 == 0 else "buzz" if i % 5 == 0 else i + ) for i in range(1, n + 1) ] return result diff --git a/chatgpt-mentor/fizzbuzz_chatgpt_option_3.py b/chatgpt-mentor/fizzbuzz_chatgpt_option_3.py index 1e1688c5f0..898428ef72 100644 --- a/chatgpt-mentor/fizzbuzz_chatgpt_option_3.py +++ b/chatgpt-mentor/fizzbuzz_chatgpt_option_3.py @@ -1,11 +1,9 @@ def fizzbuzz(n): return ( - "fizz buzz" - if i % 15 == 0 - else "fizz" - if i % 3 == 0 - else "buzz" - if i % 5 == 0 - else i + ( + "fizz buzz" + if i % 15 == 0 + else "fizz" if i % 3 == 0 else "buzz" if i % 5 == 0 else i + ) for i in range(1, n + 1) ) diff --git a/chatgpt-unit-tests-python/test_fizzbuzz_pytest.py b/chatgpt-unit-tests-python/test_fizzbuzz_pytest.py index 6faad26f38..756415803a 100644 --- a/chatgpt-unit-tests-python/test_fizzbuzz_pytest.py +++ b/chatgpt-unit-tests-python/test_fizzbuzz_pytest.py @@ -1,5 +1,4 @@ import pytest - from fizzbuzz import fizzbuzz # def test_fizzbuzz_with_number_divisible_by_15(): diff --git a/chatterbot/source_code_final/bot.py b/chatterbot/source_code_final/bot.py index 6e47da16f8..f6adfbfbc1 100644 --- a/chatterbot/source_code_final/bot.py +++ b/chatterbot/source_code_final/bot.py @@ -1,7 +1,7 @@ -from chatterbot import ChatBot -from chatterbot.trainers import ListTrainer from cleaner import clean_corpus +from chatterbot import ChatBot +from chatterbot.trainers import ListTrainer CORPUS_FILE = "chat.txt" diff --git a/chatterbot/source_code_step_5/bot.py b/chatterbot/source_code_step_5/bot.py index 6e47da16f8..f6adfbfbc1 100644 --- a/chatterbot/source_code_step_5/bot.py +++ b/chatterbot/source_code_step_5/bot.py @@ -1,7 +1,7 @@ -from chatterbot import ChatBot -from chatterbot.trainers import ListTrainer from cleaner import clean_corpus +from chatterbot import ChatBot +from chatterbot.trainers import ListTrainer CORPUS_FILE = "chat.txt" diff --git a/code-image-generator/source_code_final/app.py b/code-image-generator/source_code_final/app.py index e928665728..36d11910fd 100644 --- a/code-image-generator/source_code_final/app.py +++ b/code-image-generator/source_code_final/app.py @@ -1,4 +1,5 @@ import base64 + from flask import ( Flask, redirect, diff --git a/code-image-generator/source_code_step_04/app.py b/code-image-generator/source_code_step_04/app.py index 87a7fcc0cd..8dafeb0c8c 100644 --- a/code-image-generator/source_code_step_04/app.py +++ b/code-image-generator/source_code_step_04/app.py @@ -1,4 +1,5 @@ import base64 + from flask import ( Flask, redirect, diff --git a/concurrency-overview/io_asyncio.py b/concurrency-overview/io_asyncio.py index 62d5deea45..7a062c4977 100755 --- a/concurrency-overview/io_asyncio.py +++ b/concurrency-overview/io_asyncio.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import asyncio import time + import aiohttp diff --git a/concurrency-overview/io_mp.py b/concurrency-overview/io_mp.py index f70a6be401..174d99fceb 100755 --- a/concurrency-overview/io_mp.py +++ b/concurrency-overview/io_mp.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 -import requests import multiprocessing import time +import requests + session = None diff --git a/concurrency-overview/io_non_concurrent.py b/concurrency-overview/io_non_concurrent.py index 27504562fa..2fef578b0f 100755 --- a/concurrency-overview/io_non_concurrent.py +++ b/concurrency-overview/io_non_concurrent.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 -import requests import time +import requests + def download_site(url, session): with session.get(url) as response: diff --git a/concurrency-overview/io_threading.py b/concurrency-overview/io_threading.py index 1bd9282afb..0b7458ed90 100755 --- a/concurrency-overview/io_threading.py +++ b/concurrency-overview/io_threading.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 import concurrent.futures -import requests import threading import time +import requests thread_local = threading.local() diff --git a/concurrency-overview/race_condition.py b/concurrency-overview/race_condition.py index 515977fe25..7f75c9faf8 100755 --- a/concurrency-overview/race_condition.py +++ b/concurrency-overview/race_condition.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import concurrent.futures - counter = 0 diff --git a/crud-operations/crud_fastapi.py b/crud-operations/crud_fastapi.py index 5c07211817..d8a00c0b40 100644 --- a/crud-operations/crud_fastapi.py +++ b/crud-operations/crud_fastapi.py @@ -1,10 +1,9 @@ -from fastapi import FastAPI, HTTPException, Depends -from sqlalchemy import select -from sqlalchemy.orm import Session -from pydantic import BaseModel, ConfigDict - from crud_sql_alchemy import Bird, init_db from crud_sql_alchemy import Session as SessionLocal +from fastapi import Depends, FastAPI, HTTPException +from pydantic import BaseModel, ConfigDict +from sqlalchemy import select +from sqlalchemy.orm import Session app = FastAPI() init_db() diff --git a/crud-operations/crud_sql_alchemy.py b/crud-operations/crud_sql_alchemy.py index 066cf31ffc..5b9018371f 100644 --- a/crud-operations/crud_sql_alchemy.py +++ b/crud-operations/crud_sql_alchemy.py @@ -1,4 +1,4 @@ -from sqlalchemy import create_engine, Column, Integer, String +from sqlalchemy import Column, Integer, String, create_engine from sqlalchemy.orm import DeclarativeBase, sessionmaker diff --git a/django-diary/source_code_final/diary/urls.py b/django-diary/source_code_final/diary/urls.py index dd5d555f77..7e0dbbe031 100644 --- a/django-diary/source_code_final/diary/urls.py +++ b/django-diary/source_code_final/diary/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-diary/source_code_final/entries/admin.py b/django-diary/source_code_final/entries/admin.py index 9047611e37..f9de2d78e2 100644 --- a/django-diary/source_code_final/entries/admin.py +++ b/django-diary/source_code_final/entries/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import Entry admin.site.register(Entry) diff --git a/django-diary/source_code_final/entries/views.py b/django-diary/source_code_final/entries/views.py index af92768e07..ff0f3e8397 100644 --- a/django-diary/source_code_final/entries/views.py +++ b/django-diary/source_code_final/entries/views.py @@ -1,13 +1,13 @@ -from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib import messages +from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin from django.urls import reverse_lazy from django.views.generic import ( - ListView, - DetailView, CreateView, - UpdateView, DeleteView, + DetailView, + ListView, + UpdateView, ) from .models import Entry diff --git a/django-diary/source_code_step_1/diary/urls.py b/django-diary/source_code_step_1/diary/urls.py index 4078f2461c..0b35a4c9e1 100644 --- a/django-diary/source_code_step_1/diary/urls.py +++ b/django-diary/source_code_step_1/diary/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-diary/source_code_step_2/diary/urls.py b/django-diary/source_code_step_2/diary/urls.py index 4078f2461c..0b35a4c9e1 100644 --- a/django-diary/source_code_step_2/diary/urls.py +++ b/django-diary/source_code_step_2/diary/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-diary/source_code_step_2/entries/admin.py b/django-diary/source_code_step_2/entries/admin.py index 9047611e37..f9de2d78e2 100644 --- a/django-diary/source_code_step_2/entries/admin.py +++ b/django-diary/source_code_step_2/entries/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import Entry admin.site.register(Entry) diff --git a/django-diary/source_code_step_3/diary/urls.py b/django-diary/source_code_step_3/diary/urls.py index dd5d555f77..7e0dbbe031 100644 --- a/django-diary/source_code_step_3/diary/urls.py +++ b/django-diary/source_code_step_3/diary/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-diary/source_code_step_3/entries/admin.py b/django-diary/source_code_step_3/entries/admin.py index 9047611e37..f9de2d78e2 100644 --- a/django-diary/source_code_step_3/entries/admin.py +++ b/django-diary/source_code_step_3/entries/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import Entry admin.site.register(Entry) diff --git a/django-diary/source_code_step_3/entries/views.py b/django-diary/source_code_step_3/entries/views.py index 6063445129..8093802fc8 100644 --- a/django-diary/source_code_step_3/entries/views.py +++ b/django-diary/source_code_step_3/entries/views.py @@ -1,6 +1,6 @@ from django.views.generic import ( - ListView, DetailView, + ListView, ) from .models import Entry diff --git a/django-diary/source_code_step_4/diary/urls.py b/django-diary/source_code_step_4/diary/urls.py index dd5d555f77..7e0dbbe031 100644 --- a/django-diary/source_code_step_4/diary/urls.py +++ b/django-diary/source_code_step_4/diary/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-diary/source_code_step_4/entries/admin.py b/django-diary/source_code_step_4/entries/admin.py index 9047611e37..f9de2d78e2 100644 --- a/django-diary/source_code_step_4/entries/admin.py +++ b/django-diary/source_code_step_4/entries/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import Entry admin.site.register(Entry) diff --git a/django-diary/source_code_step_4/entries/views.py b/django-diary/source_code_step_4/entries/views.py index 6063445129..8093802fc8 100644 --- a/django-diary/source_code_step_4/entries/views.py +++ b/django-diary/source_code_step_4/entries/views.py @@ -1,6 +1,6 @@ from django.views.generic import ( - ListView, DetailView, + ListView, ) from .models import Entry diff --git a/django-diary/source_code_step_5/diary/urls.py b/django-diary/source_code_step_5/diary/urls.py index dd5d555f77..7e0dbbe031 100644 --- a/django-diary/source_code_step_5/diary/urls.py +++ b/django-diary/source_code_step_5/diary/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-diary/source_code_step_5/entries/admin.py b/django-diary/source_code_step_5/entries/admin.py index 9047611e37..f9de2d78e2 100644 --- a/django-diary/source_code_step_5/entries/admin.py +++ b/django-diary/source_code_step_5/entries/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import Entry admin.site.register(Entry) diff --git a/django-diary/source_code_step_5/entries/views.py b/django-diary/source_code_step_5/entries/views.py index 5258e71abd..93ac80b9fc 100644 --- a/django-diary/source_code_step_5/entries/views.py +++ b/django-diary/source_code_step_5/entries/views.py @@ -1,10 +1,10 @@ from django.urls import reverse_lazy from django.views.generic import ( - ListView, - DetailView, CreateView, - UpdateView, DeleteView, + DetailView, + ListView, + UpdateView, ) from .models import Entry diff --git a/django-diary/source_code_step_6/diary/urls.py b/django-diary/source_code_step_6/diary/urls.py index dd5d555f77..7e0dbbe031 100644 --- a/django-diary/source_code_step_6/diary/urls.py +++ b/django-diary/source_code_step_6/diary/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-diary/source_code_step_6/entries/admin.py b/django-diary/source_code_step_6/entries/admin.py index 9047611e37..f9de2d78e2 100644 --- a/django-diary/source_code_step_6/entries/admin.py +++ b/django-diary/source_code_step_6/entries/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import Entry admin.site.register(Entry) diff --git a/django-diary/source_code_step_6/entries/views.py b/django-diary/source_code_step_6/entries/views.py index 58353335d2..d0f8e3d5e0 100644 --- a/django-diary/source_code_step_6/entries/views.py +++ b/django-diary/source_code_step_6/entries/views.py @@ -2,11 +2,11 @@ from django.contrib.messages.views import SuccessMessageMixin from django.urls import reverse_lazy from django.views.generic import ( - ListView, - DetailView, CreateView, - UpdateView, DeleteView, + DetailView, + ListView, + UpdateView, ) from .models import Entry diff --git a/django-flashcards-app/source_code_final/cards/templatetags/cards_tags.py b/django-flashcards-app/source_code_final/cards/templatetags/cards_tags.py index e8b653d143..f2382d808b 100644 --- a/django-flashcards-app/source_code_final/cards/templatetags/cards_tags.py +++ b/django-flashcards-app/source_code_final/cards/templatetags/cards_tags.py @@ -1,6 +1,5 @@ -from django import template - from cards.models import BOXES, Card +from django import template register = template.Library() diff --git a/django-flashcards-app/source_code_final/cards/views.py b/django-flashcards-app/source_code_final/cards/views.py index 1d26c20de4..94ab3270ec 100644 --- a/django-flashcards-app/source_code_final/cards/views.py +++ b/django-flashcards-app/source_code_final/cards/views.py @@ -3,13 +3,13 @@ from django.shortcuts import get_object_or_404, redirect from django.urls import reverse_lazy from django.views.generic import ( - ListView, CreateView, + ListView, UpdateView, ) -from .models import Card from .forms import CardCheckForm +from .models import Card class CardListView(ListView): diff --git a/django-flashcards-app/source_code_final/flashcards/urls.py b/django-flashcards-app/source_code_final/flashcards/urls.py index 00e2b493ba..67d3a9662a 100644 --- a/django-flashcards-app/source_code_final/flashcards/urls.py +++ b/django-flashcards-app/source_code_final/flashcards/urls.py @@ -1,6 +1,5 @@ from django.contrib import admin -from django.urls import path, include - +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-flashcards-app/source_code_step_1/flashcards/urls.py b/django-flashcards-app/source_code_step_1/flashcards/urls.py index f509f827cf..dd31c445c3 100644 --- a/django-flashcards-app/source_code_step_1/flashcards/urls.py +++ b/django-flashcards-app/source_code_step_1/flashcards/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-flashcards-app/source_code_step_2/flashcards/urls.py b/django-flashcards-app/source_code_step_2/flashcards/urls.py index bd3ec4e7ed..bfce339f73 100644 --- a/django-flashcards-app/source_code_step_2/flashcards/urls.py +++ b/django-flashcards-app/source_code_step_2/flashcards/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-flashcards-app/source_code_step_3/flashcards/urls.py b/django-flashcards-app/source_code_step_3/flashcards/urls.py index bd3ec4e7ed..bfce339f73 100644 --- a/django-flashcards-app/source_code_step_3/flashcards/urls.py +++ b/django-flashcards-app/source_code_step_3/flashcards/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-flashcards-app/source_code_step_4/cards/views.py b/django-flashcards-app/source_code_step_4/cards/views.py index 4eb8e4fd8b..730cd33bf6 100644 --- a/django-flashcards-app/source_code_step_4/cards/views.py +++ b/django-flashcards-app/source_code_step_4/cards/views.py @@ -1,7 +1,7 @@ from django.urls import reverse_lazy from django.views.generic import ( - ListView, CreateView, + ListView, UpdateView, ) diff --git a/django-flashcards-app/source_code_step_4/flashcards/urls.py b/django-flashcards-app/source_code_step_4/flashcards/urls.py index bd3ec4e7ed..bfce339f73 100644 --- a/django-flashcards-app/source_code_step_4/flashcards/urls.py +++ b/django-flashcards-app/source_code_step_4/flashcards/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-flashcards-app/source_code_step_5/cards/views.py b/django-flashcards-app/source_code_step_5/cards/views.py index 4eb8e4fd8b..730cd33bf6 100644 --- a/django-flashcards-app/source_code_step_5/cards/views.py +++ b/django-flashcards-app/source_code_step_5/cards/views.py @@ -1,7 +1,7 @@ from django.urls import reverse_lazy from django.views.generic import ( - ListView, CreateView, + ListView, UpdateView, ) diff --git a/django-flashcards-app/source_code_step_5/flashcards/urls.py b/django-flashcards-app/source_code_step_5/flashcards/urls.py index bd3ec4e7ed..bfce339f73 100644 --- a/django-flashcards-app/source_code_step_5/flashcards/urls.py +++ b/django-flashcards-app/source_code_step_5/flashcards/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-flashcards-app/source_code_step_6/cards/templatetags/cards_tags.py b/django-flashcards-app/source_code_step_6/cards/templatetags/cards_tags.py index e8b653d143..f2382d808b 100644 --- a/django-flashcards-app/source_code_step_6/cards/templatetags/cards_tags.py +++ b/django-flashcards-app/source_code_step_6/cards/templatetags/cards_tags.py @@ -1,6 +1,5 @@ -from django import template - from cards.models import BOXES, Card +from django import template register = template.Library() diff --git a/django-flashcards-app/source_code_step_6/cards/views.py b/django-flashcards-app/source_code_step_6/cards/views.py index 769ea76d95..94ab3270ec 100644 --- a/django-flashcards-app/source_code_step_6/cards/views.py +++ b/django-flashcards-app/source_code_step_6/cards/views.py @@ -3,8 +3,8 @@ from django.shortcuts import get_object_or_404, redirect from django.urls import reverse_lazy from django.views.generic import ( - ListView, CreateView, + ListView, UpdateView, ) diff --git a/django-flashcards-app/source_code_step_6/flashcards/urls.py b/django-flashcards-app/source_code_step_6/flashcards/urls.py index bd3ec4e7ed..bfce339f73 100644 --- a/django-flashcards-app/source_code_step_6/flashcards/urls.py +++ b/django-flashcards-app/source_code_step_6/flashcards/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-gunicorn-nginx/myapp/urls.py b/django-gunicorn-nginx/myapp/urls.py index ffeb778214..5119061b3e 100644 --- a/django-gunicorn-nginx/myapp/urls.py +++ b/django-gunicorn-nginx/myapp/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from . import views urlpatterns = [ diff --git a/django-hosting-heroku/source_code_final/portfolio-project/portfolio/settings.py b/django-hosting-heroku/source_code_final/portfolio-project/portfolio/settings.py index 923981d45e..c8ac117b9c 100644 --- a/django-hosting-heroku/source_code_final/portfolio-project/portfolio/settings.py +++ b/django-hosting-heroku/source_code_final/portfolio-project/portfolio/settings.py @@ -12,6 +12,8 @@ from pathlib import Path +import django_heroku + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -123,6 +125,5 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" -import django_heroku django_heroku.settings(locals()) diff --git a/django-hosting-heroku/source_code_final/portfolio-project/portfolio/urls.py b/django-hosting-heroku/source_code_final/portfolio-project/portfolio/urls.py index eee8f1f75d..be059233be 100644 --- a/django-hosting-heroku/source_code_final/portfolio-project/portfolio/urls.py +++ b/django-hosting-heroku/source_code_final/portfolio-project/portfolio/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-hosting-heroku/source_code_step_1/portfolio-project/portfolio/urls.py b/django-hosting-heroku/source_code_step_1/portfolio-project/portfolio/urls.py index eee8f1f75d..be059233be 100644 --- a/django-hosting-heroku/source_code_step_1/portfolio-project/portfolio/urls.py +++ b/django-hosting-heroku/source_code_step_1/portfolio-project/portfolio/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-hosting-heroku/source_code_step_2/portfolio-project/portfolio/urls.py b/django-hosting-heroku/source_code_step_2/portfolio-project/portfolio/urls.py index eee8f1f75d..be059233be 100644 --- a/django-hosting-heroku/source_code_step_2/portfolio-project/portfolio/urls.py +++ b/django-hosting-heroku/source_code_step_2/portfolio-project/portfolio/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/settings.py b/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/settings.py index 923981d45e..c8ac117b9c 100644 --- a/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/settings.py +++ b/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/settings.py @@ -12,6 +12,8 @@ from pathlib import Path +import django_heroku + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -123,6 +125,5 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" -import django_heroku django_heroku.settings(locals()) diff --git a/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/urls.py b/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/urls.py index eee8f1f75d..be059233be 100644 --- a/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/urls.py +++ b/django-hosting-heroku/source_code_step_7/portfolio-project/portfolio/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/settings.py b/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/settings.py index 923981d45e..c8ac117b9c 100644 --- a/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/settings.py +++ b/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/settings.py @@ -12,6 +12,8 @@ from pathlib import Path +import django_heroku + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -123,6 +125,5 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" -import django_heroku django_heroku.settings(locals()) diff --git a/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/urls.py b/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/urls.py index eee8f1f75d..be059233be 100644 --- a/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/urls.py +++ b/django-hosting-heroku/source_code_step_8/portfolio-project/portfolio/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-markdown/dmd_project/urls.py b/django-markdown/dmd_project/urls.py index 4139458868..2ddfdc32b2 100644 --- a/django-markdown/dmd_project/urls.py +++ b/django-markdown/dmd_project/urls.py @@ -1,6 +1,5 @@ from django.contrib import admin from django.urls import path - from dmd_app.views import markdown_content_view urlpatterns = [ diff --git a/django-migrations/bitcoin_tracker/bitcoin_tracker/settings.py b/django-migrations/bitcoin_tracker/bitcoin_tracker/settings.py index 0c15acc1ab..7b3748cdce 100644 --- a/django-migrations/bitcoin_tracker/bitcoin_tracker/settings.py +++ b/django-migrations/bitcoin_tracker/bitcoin_tracker/settings.py @@ -87,14 +87,14 @@ AUTH_PASSWORD_VALIDATORS = [ { - "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator" # noqa + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator" }, {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"}, { - "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator" # noqa + "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator" }, { - "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator" # noqa + "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator" }, ] diff --git a/django-migrations/bitcoin_tracker/bitcoin_tracker/urls.py b/django-migrations/bitcoin_tracker/bitcoin_tracker/urls.py index 5058ef37b4..1903c817b4 100644 --- a/django-migrations/bitcoin_tracker/bitcoin_tracker/urls.py +++ b/django-migrations/bitcoin_tracker/bitcoin_tracker/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-pagination/pythonwiki/urls.py b/django-pagination/pythonwiki/urls.py index be86394988..953bce1b43 100644 --- a/django-pagination/pythonwiki/urls.py +++ b/django-pagination/pythonwiki/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-pagination/terms/urls.py b/django-pagination/terms/urls.py index 94599c8063..8ce9d9f351 100644 --- a/django-pagination/terms/urls.py +++ b/django-pagination/terms/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from . import views urlpatterns = [ diff --git a/django-pagination/terms/views.py b/django-pagination/terms/views.py index 5a37c1c492..60f74389c6 100644 --- a/django-pagination/terms/views.py +++ b/django-pagination/terms/views.py @@ -1,7 +1,7 @@ -from django.views.generic import ListView from django.core.paginator import Paginator -from django.shortcuts import render from django.http import JsonResponse +from django.shortcuts import render +from django.views.generic import ListView from terms.models import Keyword diff --git a/django-todo-list/source_code_final/todo_app/admin.py b/django-todo-list/source_code_final/todo_app/admin.py index 75f0d14b50..42d6ba06c3 100644 --- a/django-todo-list/source_code_final/todo_app/admin.py +++ b/django-todo-list/source_code_final/todo_app/admin.py @@ -1,6 +1,7 @@ # todo_list/todo_app/admin.py from django.contrib import admin + from todo_app.models import ToDoItem, ToDoList admin.site.register(ToDoItem) diff --git a/django-todo-list/source_code_final/todo_app/models.py b/django-todo-list/source_code_final/todo_app/models.py index 7335b78c1c..859433119e 100644 --- a/django-todo-list/source_code_final/todo_app/models.py +++ b/django-todo-list/source_code_final/todo_app/models.py @@ -1,8 +1,7 @@ # todo_list/todo_app/models.py -from django.utils import timezone - from django.db import models from django.urls import reverse +from django.utils import timezone def one_week_hence(): diff --git a/django-todo-list/source_code_final/todo_app/urls.py b/django-todo-list/source_code_final/todo_app/urls.py index 6e250fa473..87eb9dae4e 100644 --- a/django-todo-list/source_code_final/todo_app/urls.py +++ b/django-todo-list/source_code_final/todo_app/urls.py @@ -1,5 +1,6 @@ # todo_list/todo_app/urls.py from django.urls import path + from todo_app import views urlpatterns = [ diff --git a/django-todo-list/source_code_final/todo_app/views.py b/django-todo-list/source_code_final/todo_app/views.py index 93471e396d..832c56065b 100644 --- a/django-todo-list/source_code_final/todo_app/views.py +++ b/django-todo-list/source_code_final/todo_app/views.py @@ -1,12 +1,12 @@ # todo_list/todo_app/views.py from django.urls import reverse, reverse_lazy - from django.views.generic import ( - ListView, CreateView, - UpdateView, DeleteView, + ListView, + UpdateView, ) + from .models import ToDoItem, ToDoList diff --git a/django-todo-list/source_code_final/todo_project/urls.py b/django-todo-list/source_code_final/todo_project/urls.py index 01f447c3b2..dda627b360 100644 --- a/django-todo-list/source_code_final/todo_project/urls.py +++ b/django-todo-list/source_code_final/todo_project/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import include, path diff --git a/django-todo-list/source_code_step_2/todo_project/urls.py b/django-todo-list/source_code_step_2/todo_project/urls.py index 4ef5dbbb72..dda627b360 100644 --- a/django-todo-list/source_code_step_2/todo_project/urls.py +++ b/django-todo-list/source_code_step_2/todo_project/urls.py @@ -13,9 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path -from django.urls import include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-todo-list/source_code_step_3/todo_app/models.py b/django-todo-list/source_code_step_3/todo_app/models.py index 7335b78c1c..859433119e 100644 --- a/django-todo-list/source_code_step_3/todo_app/models.py +++ b/django-todo-list/source_code_step_3/todo_app/models.py @@ -1,8 +1,7 @@ # todo_list/todo_app/models.py -from django.utils import timezone - from django.db import models from django.urls import reverse +from django.utils import timezone def one_week_hence(): diff --git a/django-todo-list/source_code_step_3/todo_project/urls.py b/django-todo-list/source_code_step_3/todo_project/urls.py index 4ef5dbbb72..dda627b360 100644 --- a/django-todo-list/source_code_step_3/todo_project/urls.py +++ b/django-todo-list/source_code_step_3/todo_project/urls.py @@ -13,9 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path -from django.urls import include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-todo-list/source_code_step_4/todo_app/admin.py b/django-todo-list/source_code_step_4/todo_app/admin.py index 75f0d14b50..42d6ba06c3 100644 --- a/django-todo-list/source_code_step_4/todo_app/admin.py +++ b/django-todo-list/source_code_step_4/todo_app/admin.py @@ -1,6 +1,7 @@ # todo_list/todo_app/admin.py from django.contrib import admin + from todo_app.models import ToDoItem, ToDoList admin.site.register(ToDoItem) diff --git a/django-todo-list/source_code_step_4/todo_app/models.py b/django-todo-list/source_code_step_4/todo_app/models.py index 7335b78c1c..859433119e 100644 --- a/django-todo-list/source_code_step_4/todo_app/models.py +++ b/django-todo-list/source_code_step_4/todo_app/models.py @@ -1,8 +1,7 @@ # todo_list/todo_app/models.py -from django.utils import timezone - from django.db import models from django.urls import reverse +from django.utils import timezone def one_week_hence(): diff --git a/django-todo-list/source_code_step_4/todo_project/urls.py b/django-todo-list/source_code_step_4/todo_project/urls.py index 4ef5dbbb72..dda627b360 100644 --- a/django-todo-list/source_code_step_4/todo_project/urls.py +++ b/django-todo-list/source_code_step_4/todo_project/urls.py @@ -13,9 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path -from django.urls import include +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-todo-list/source_code_step_5/todo_app/admin.py b/django-todo-list/source_code_step_5/todo_app/admin.py index 75f0d14b50..42d6ba06c3 100644 --- a/django-todo-list/source_code_step_5/todo_app/admin.py +++ b/django-todo-list/source_code_step_5/todo_app/admin.py @@ -1,6 +1,7 @@ # todo_list/todo_app/admin.py from django.contrib import admin + from todo_app.models import ToDoItem, ToDoList admin.site.register(ToDoItem) diff --git a/django-todo-list/source_code_step_5/todo_app/models.py b/django-todo-list/source_code_step_5/todo_app/models.py index 7335b78c1c..859433119e 100644 --- a/django-todo-list/source_code_step_5/todo_app/models.py +++ b/django-todo-list/source_code_step_5/todo_app/models.py @@ -1,8 +1,7 @@ # todo_list/todo_app/models.py -from django.utils import timezone - from django.db import models from django.urls import reverse +from django.utils import timezone def one_week_hence(): diff --git a/django-todo-list/source_code_step_5/todo_app/urls.py b/django-todo-list/source_code_step_5/todo_app/urls.py index 29d6f70467..2e631c036d 100644 --- a/django-todo-list/source_code_step_5/todo_app/urls.py +++ b/django-todo-list/source_code_step_5/todo_app/urls.py @@ -1,5 +1,6 @@ # todo_list/todo_app/urls.py from django.urls import path + from todo_app import views urlpatterns = [ diff --git a/django-todo-list/source_code_step_5/todo_app/views.py b/django-todo-list/source_code_step_5/todo_app/views.py index 1a559746bf..8b0efd152d 100644 --- a/django-todo-list/source_code_step_5/todo_app/views.py +++ b/django-todo-list/source_code_step_5/todo_app/views.py @@ -1,6 +1,7 @@ # todo_list/todo_app/views.py from django.views.generic import ListView -from .models import ToDoList, ToDoItem + +from .models import ToDoItem, ToDoList class ListListView(ListView): diff --git a/django-todo-list/source_code_step_5/todo_project/urls.py b/django-todo-list/source_code_step_5/todo_project/urls.py index 95f4c4ab7a..dda627b360 100644 --- a/django-todo-list/source_code_step_5/todo_project/urls.py +++ b/django-todo-list/source_code_step_5/todo_project/urls.py @@ -13,10 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.contrib import admin -from django.urls import path -from django.urls import include +from django.contrib import admin +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-todo-list/source_code_step_6/todo_app/admin.py b/django-todo-list/source_code_step_6/todo_app/admin.py index 75f0d14b50..42d6ba06c3 100644 --- a/django-todo-list/source_code_step_6/todo_app/admin.py +++ b/django-todo-list/source_code_step_6/todo_app/admin.py @@ -1,6 +1,7 @@ # todo_list/todo_app/admin.py from django.contrib import admin + from todo_app.models import ToDoItem, ToDoList admin.site.register(ToDoItem) diff --git a/django-todo-list/source_code_step_6/todo_app/models.py b/django-todo-list/source_code_step_6/todo_app/models.py index 7335b78c1c..859433119e 100644 --- a/django-todo-list/source_code_step_6/todo_app/models.py +++ b/django-todo-list/source_code_step_6/todo_app/models.py @@ -1,8 +1,7 @@ # todo_list/todo_app/models.py -from django.utils import timezone - from django.db import models from django.urls import reverse +from django.utils import timezone def one_week_hence(): diff --git a/django-todo-list/source_code_step_6/todo_app/urls.py b/django-todo-list/source_code_step_6/todo_app/urls.py index a50a9365ce..1d6c6ba646 100644 --- a/django-todo-list/source_code_step_6/todo_app/urls.py +++ b/django-todo-list/source_code_step_6/todo_app/urls.py @@ -1,5 +1,6 @@ # todo_list/todo_app/urls.py from django.urls import path + from todo_app import views urlpatterns = [ diff --git a/django-todo-list/source_code_step_6/todo_app/views.py b/django-todo-list/source_code_step_6/todo_app/views.py index 81e78cb22a..26da97d4c5 100644 --- a/django-todo-list/source_code_step_6/todo_app/views.py +++ b/django-todo-list/source_code_step_6/todo_app/views.py @@ -1,11 +1,11 @@ # todo_list/todo_app/views.py from django.urls import reverse - from django.views.generic import ( - ListView, CreateView, + ListView, UpdateView, ) + from .models import ToDoItem, ToDoList diff --git a/django-todo-list/source_code_step_6/todo_project/urls.py b/django-todo-list/source_code_step_6/todo_project/urls.py index 01f447c3b2..dda627b360 100644 --- a/django-todo-list/source_code_step_6/todo_project/urls.py +++ b/django-todo-list/source_code_step_6/todo_project/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import include, path diff --git a/django-todo-list/source_code_step_7/todo_app/admin.py b/django-todo-list/source_code_step_7/todo_app/admin.py index 75f0d14b50..42d6ba06c3 100644 --- a/django-todo-list/source_code_step_7/todo_app/admin.py +++ b/django-todo-list/source_code_step_7/todo_app/admin.py @@ -1,6 +1,7 @@ # todo_list/todo_app/admin.py from django.contrib import admin + from todo_app.models import ToDoItem, ToDoList admin.site.register(ToDoItem) diff --git a/django-todo-list/source_code_step_7/todo_app/models.py b/django-todo-list/source_code_step_7/todo_app/models.py index 7335b78c1c..859433119e 100644 --- a/django-todo-list/source_code_step_7/todo_app/models.py +++ b/django-todo-list/source_code_step_7/todo_app/models.py @@ -1,8 +1,7 @@ # todo_list/todo_app/models.py -from django.utils import timezone - from django.db import models from django.urls import reverse +from django.utils import timezone def one_week_hence(): diff --git a/django-todo-list/source_code_step_7/todo_app/urls.py b/django-todo-list/source_code_step_7/todo_app/urls.py index 6e250fa473..87eb9dae4e 100644 --- a/django-todo-list/source_code_step_7/todo_app/urls.py +++ b/django-todo-list/source_code_step_7/todo_app/urls.py @@ -1,5 +1,6 @@ # todo_list/todo_app/urls.py from django.urls import path + from todo_app import views urlpatterns = [ diff --git a/django-todo-list/source_code_step_7/todo_app/views.py b/django-todo-list/source_code_step_7/todo_app/views.py index 93471e396d..832c56065b 100644 --- a/django-todo-list/source_code_step_7/todo_app/views.py +++ b/django-todo-list/source_code_step_7/todo_app/views.py @@ -1,12 +1,12 @@ # todo_list/todo_app/views.py from django.urls import reverse, reverse_lazy - from django.views.generic import ( - ListView, CreateView, - UpdateView, DeleteView, + ListView, + UpdateView, ) + from .models import ToDoItem, ToDoList diff --git a/django-todo-list/source_code_step_7/todo_project/urls.py b/django-todo-list/source_code_step_7/todo_project/urls.py index 01f447c3b2..dda627b360 100644 --- a/django-todo-list/source_code_step_7/todo_project/urls.py +++ b/django-todo-list/source_code_step_7/todo_project/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import include, path diff --git a/django-view-auth/Blog/Blog/urls.py b/django-view-auth/Blog/Blog/urls.py index 074515da67..ef60954aac 100644 --- a/django-view-auth/Blog/Blog/urls.py +++ b/django-view-auth/Blog/Blog/urls.py @@ -1,6 +1,6 @@ -from django.contrib import admin -from django.urls import path, include from core import views as core_views +from django.contrib import admin +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/django-view-auth/Blog/core/admin.py b/django-view-auth/Blog/core/admin.py index 590454e294..7b1112ea58 100644 --- a/django-view-auth/Blog/core/admin.py +++ b/django-view-auth/Blog/core/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from core.models import Blog diff --git a/django-view-auth/Blog/core/views.py b/django-view-auth/Blog/core/views.py index 7c099d34ca..c9e3e042f2 100644 --- a/django-view-auth/Blog/core/views.py +++ b/django-view-auth/Blog/core/views.py @@ -1,7 +1,8 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required, user_passes_test from django.http import HttpResponse -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import get_object_or_404, render + from core.models import Blog diff --git a/django-vue-graphql/source_code_final/back_end/blog/admin.py b/django-vue-graphql/source_code_final/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_final/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_final/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_final/back_end/blog/models.py b/django-vue-graphql/source_code_final/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_final/back_end/blog/models.py +++ b/django-vue-graphql/source_code_final/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/django-vue-graphql/source_code_step_1/back_end/backend/urls.py b/django-vue-graphql/source_code_step_1/back_end/backend/urls.py index 3c88205ae4..8d6ded5f67 100644 --- a/django-vue-graphql/source_code_step_1/back_end/backend/urls.py +++ b/django-vue-graphql/source_code_step_1/back_end/backend/urls.py @@ -14,6 +14,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-vue-graphql/source_code_step_2/back_end/backend/urls.py b/django-vue-graphql/source_code_step_2/back_end/backend/urls.py index 3c88205ae4..8d6ded5f67 100644 --- a/django-vue-graphql/source_code_step_2/back_end/backend/urls.py +++ b/django-vue-graphql/source_code_step_2/back_end/backend/urls.py @@ -14,6 +14,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/django-vue-graphql/source_code_step_2/back_end/blog/admin.py b/django-vue-graphql/source_code_step_2/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_step_2/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_step_2/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_step_2/back_end/blog/models.py b/django-vue-graphql/source_code_step_2/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_step_2/back_end/blog/models.py +++ b/django-vue-graphql/source_code_step_2/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/django-vue-graphql/source_code_step_3/back_end/blog/admin.py b/django-vue-graphql/source_code_step_3/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_step_3/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_step_3/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_step_3/back_end/blog/models.py b/django-vue-graphql/source_code_step_3/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_step_3/back_end/blog/models.py +++ b/django-vue-graphql/source_code_step_3/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/django-vue-graphql/source_code_step_4/back_end/blog/admin.py b/django-vue-graphql/source_code_step_4/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_step_4/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_step_4/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_step_4/back_end/blog/models.py b/django-vue-graphql/source_code_step_4/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_step_4/back_end/blog/models.py +++ b/django-vue-graphql/source_code_step_4/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/django-vue-graphql/source_code_step_5/back_end/blog/admin.py b/django-vue-graphql/source_code_step_5/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_step_5/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_step_5/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_step_5/back_end/blog/models.py b/django-vue-graphql/source_code_step_5/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_step_5/back_end/blog/models.py +++ b/django-vue-graphql/source_code_step_5/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/django-vue-graphql/source_code_step_6/back_end/blog/admin.py b/django-vue-graphql/source_code_step_6/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_step_6/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_step_6/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_step_6/back_end/blog/models.py b/django-vue-graphql/source_code_step_6/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_step_6/back_end/blog/models.py +++ b/django-vue-graphql/source_code_step_6/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/django-vue-graphql/source_code_step_7/back_end/blog/admin.py b/django-vue-graphql/source_code_step_7/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_step_7/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_step_7/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_step_7/back_end/blog/models.py b/django-vue-graphql/source_code_step_7/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_step_7/back_end/blog/models.py +++ b/django-vue-graphql/source_code_step_7/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/django-vue-graphql/source_code_step_8/back_end/blog/admin.py b/django-vue-graphql/source_code_step_8/back_end/blog/admin.py index af4b969c32..733d711c87 100644 --- a/django-vue-graphql/source_code_step_8/back_end/blog/admin.py +++ b/django-vue-graphql/source_code_step_8/back_end/blog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from blog.models import Profile, Post, Tag + +from blog.models import Post, Profile, Tag @admin.register(Profile) diff --git a/django-vue-graphql/source_code_step_8/back_end/blog/models.py b/django-vue-graphql/source_code_step_8/back_end/blog/models.py index 666d00dc77..69bf97c6fd 100644 --- a/django-vue-graphql/source_code_step_8/back_end/blog/models.py +++ b/django-vue-graphql/source_code_step_8/back_end/blog/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.conf import settings +from django.db import models class Profile(models.Model): diff --git a/docker-continuous-integration/web/test/conftest.py b/docker-continuous-integration/web/test/conftest.py index 4738e88c93..01c3068c05 100644 --- a/docker-continuous-integration/web/test/conftest.py +++ b/docker-continuous-integration/web/test/conftest.py @@ -1,6 +1,5 @@ import pytest import redis - from page_tracker.app import app diff --git a/duck-typing-python/shapes.py b/duck-typing-python/shapes.py index eac5207543..72529f23c8 100644 --- a/duck-typing-python/shapes.py +++ b/duck-typing-python/shapes.py @@ -3,11 +3,9 @@ class Shape(Protocol): - def area(self) -> float: - ... + def area(self) -> float: ... - def perimeter(self) -> float: - ... + def perimeter(self) -> float: ... class Circle: diff --git a/dwitter-part-1/source_code_final/dwitter/admin.py b/dwitter-part-1/source_code_final/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-1/source_code_final/dwitter/admin.py +++ b/dwitter-part-1/source_code_final/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-1/source_code_final/dwitter/models.py b/dwitter-part-1/source_code_final/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-1/source_code_final/dwitter/models.py +++ b/dwitter-part-1/source_code_final/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-1/source_code_final/social/urls.py b/dwitter-part-1/source_code_final/social/urls.py index db54d28cc0..bf44619ed1 100644 --- a/dwitter-part-1/source_code_final/social/urls.py +++ b/dwitter-part-1/source_code_final/social/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/dwitter-part-1/source_code_step_01/dwitter/admin.py b/dwitter-part-1/source_code_step_01/dwitter/admin.py index 0946507011..00765311cd 100644 --- a/dwitter-part-1/source_code_step_01/dwitter/admin.py +++ b/dwitter-part-1/source_code_step_01/dwitter/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User class UserAdmin(admin.ModelAdmin): diff --git a/dwitter-part-1/source_code_step_01/social/urls.py b/dwitter-part-1/source_code_step_01/social/urls.py index db54d28cc0..bf44619ed1 100644 --- a/dwitter-part-1/source_code_step_01/social/urls.py +++ b/dwitter-part-1/source_code_step_01/social/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/dwitter-part-1/source_code_step_02/dwitter/admin.py b/dwitter-part-1/source_code_step_02/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-1/source_code_step_02/dwitter/admin.py +++ b/dwitter-part-1/source_code_step_02/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-1/source_code_step_02/dwitter/models.py b/dwitter-part-1/source_code_step_02/dwitter/models.py index 3d8bccf8ec..c020991dc3 100644 --- a/dwitter-part-1/source_code_step_02/dwitter/models.py +++ b/dwitter-part-1/source_code_step_02/dwitter/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.contrib.auth.models import User +from django.db import models class Profile(models.Model): diff --git a/dwitter-part-1/source_code_step_02/social/urls.py b/dwitter-part-1/source_code_step_02/social/urls.py index db54d28cc0..bf44619ed1 100644 --- a/dwitter-part-1/source_code_step_02/social/urls.py +++ b/dwitter-part-1/source_code_step_02/social/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/dwitter-part-1/source_code_step_03/dwitter/admin.py b/dwitter-part-1/source_code_step_03/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-1/source_code_step_03/dwitter/admin.py +++ b/dwitter-part-1/source_code_step_03/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-1/source_code_step_03/dwitter/models.py b/dwitter-part-1/source_code_step_03/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-1/source_code_step_03/dwitter/models.py +++ b/dwitter-part-1/source_code_step_03/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-1/source_code_step_03/social/urls.py b/dwitter-part-1/source_code_step_03/social/urls.py index db54d28cc0..bf44619ed1 100644 --- a/dwitter-part-1/source_code_step_03/social/urls.py +++ b/dwitter-part-1/source_code_step_03/social/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/dwitter-part-2/source_code_final/dwitter/admin.py b/dwitter-part-2/source_code_final/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-2/source_code_final/dwitter/admin.py +++ b/dwitter-part-2/source_code_final/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-2/source_code_final/dwitter/models.py b/dwitter-part-2/source_code_final/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-2/source_code_final/dwitter/models.py +++ b/dwitter-part-2/source_code_final/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-2/source_code_final/dwitter/urls.py b/dwitter-part-2/source_code_final/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-2/source_code_final/dwitter/urls.py +++ b/dwitter-part-2/source_code_final/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-2/source_code_final/dwitter/views.py b/dwitter-part-2/source_code_final/dwitter/views.py index a45d6be65b..41b9bd2941 100644 --- a/dwitter-part-2/source_code_final/dwitter/views.py +++ b/dwitter-part-2/source_code_final/dwitter/views.py @@ -1,4 +1,5 @@ from django.shortcuts import render + from .models import Profile diff --git a/dwitter-part-2/source_code_final/social/urls.py b/dwitter-part-2/source_code_final/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-2/source_code_final/social/urls.py +++ b/dwitter-part-2/source_code_final/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-2/source_code_start/dwitter/admin.py b/dwitter-part-2/source_code_start/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-2/source_code_start/dwitter/admin.py +++ b/dwitter-part-2/source_code_start/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-2/source_code_start/dwitter/models.py b/dwitter-part-2/source_code_start/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-2/source_code_start/dwitter/models.py +++ b/dwitter-part-2/source_code_start/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-2/source_code_start/social/urls.py b/dwitter-part-2/source_code_start/social/urls.py index db54d28cc0..bf44619ed1 100644 --- a/dwitter-part-2/source_code_start/social/urls.py +++ b/dwitter-part-2/source_code_start/social/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path diff --git a/dwitter-part-2/source_code_step_04/dwitter/admin.py b/dwitter-part-2/source_code_step_04/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-2/source_code_step_04/dwitter/admin.py +++ b/dwitter-part-2/source_code_step_04/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-2/source_code_step_04/dwitter/models.py b/dwitter-part-2/source_code_step_04/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-2/source_code_step_04/dwitter/models.py +++ b/dwitter-part-2/source_code_step_04/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-2/source_code_step_04/dwitter/urls.py b/dwitter-part-2/source_code_step_04/dwitter/urls.py index 387c9f08d1..ce36e97ddc 100644 --- a/dwitter-part-2/source_code_step_04/dwitter/urls.py +++ b/dwitter-part-2/source_code_step_04/dwitter/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from .views import dashboard app_name = "dwitter" diff --git a/dwitter-part-2/source_code_step_04/social/urls.py b/dwitter-part-2/source_code_step_04/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-2/source_code_step_04/social/urls.py +++ b/dwitter-part-2/source_code_step_04/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-2/source_code_step_05/dwitter/admin.py b/dwitter-part-2/source_code_step_05/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-2/source_code_step_05/dwitter/admin.py +++ b/dwitter-part-2/source_code_step_05/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-2/source_code_step_05/dwitter/models.py b/dwitter-part-2/source_code_step_05/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-2/source_code_step_05/dwitter/models.py +++ b/dwitter-part-2/source_code_step_05/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-2/source_code_step_05/dwitter/urls.py b/dwitter-part-2/source_code_step_05/dwitter/urls.py index 6238e710b1..c707f81d0d 100644 --- a/dwitter-part-2/source_code_step_05/dwitter/urls.py +++ b/dwitter-part-2/source_code_step_05/dwitter/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from .views import dashboard, profile_list app_name = "dwitter" diff --git a/dwitter-part-2/source_code_step_05/dwitter/views.py b/dwitter-part-2/source_code_step_05/dwitter/views.py index 8159869c29..884520be39 100644 --- a/dwitter-part-2/source_code_step_05/dwitter/views.py +++ b/dwitter-part-2/source_code_step_05/dwitter/views.py @@ -1,4 +1,5 @@ from django.shortcuts import render + from .models import Profile diff --git a/dwitter-part-2/source_code_step_05/social/urls.py b/dwitter-part-2/source_code_step_05/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-2/source_code_step_05/social/urls.py +++ b/dwitter-part-2/source_code_step_05/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-2/source_code_step_06/dwitter/admin.py b/dwitter-part-2/source_code_step_06/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-2/source_code_step_06/dwitter/admin.py +++ b/dwitter-part-2/source_code_step_06/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-2/source_code_step_06/dwitter/models.py b/dwitter-part-2/source_code_step_06/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-2/source_code_step_06/dwitter/models.py +++ b/dwitter-part-2/source_code_step_06/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-2/source_code_step_06/dwitter/urls.py b/dwitter-part-2/source_code_step_06/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-2/source_code_step_06/dwitter/urls.py +++ b/dwitter-part-2/source_code_step_06/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-2/source_code_step_06/dwitter/views.py b/dwitter-part-2/source_code_step_06/dwitter/views.py index a45d6be65b..41b9bd2941 100644 --- a/dwitter-part-2/source_code_step_06/dwitter/views.py +++ b/dwitter-part-2/source_code_step_06/dwitter/views.py @@ -1,4 +1,5 @@ from django.shortcuts import render + from .models import Profile diff --git a/dwitter-part-2/source_code_step_06/social/urls.py b/dwitter-part-2/source_code_step_06/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-2/source_code_step_06/social/urls.py +++ b/dwitter-part-2/source_code_step_06/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-3/source_code_final/dwitter/urls.py b/dwitter-part-3/source_code_final/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-3/source_code_final/dwitter/urls.py +++ b/dwitter-part-3/source_code_final/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-3/source_code_final/social/urls.py b/dwitter-part-3/source_code_final/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-3/source_code_final/social/urls.py +++ b/dwitter-part-3/source_code_final/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-3/source_code_start/dwitter/admin.py b/dwitter-part-3/source_code_start/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-3/source_code_start/dwitter/admin.py +++ b/dwitter-part-3/source_code_start/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-3/source_code_start/dwitter/models.py b/dwitter-part-3/source_code_start/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-3/source_code_start/dwitter/models.py +++ b/dwitter-part-3/source_code_start/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-3/source_code_start/dwitter/urls.py b/dwitter-part-3/source_code_start/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-3/source_code_start/dwitter/urls.py +++ b/dwitter-part-3/source_code_start/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-3/source_code_start/dwitter/views.py b/dwitter-part-3/source_code_start/dwitter/views.py index a45d6be65b..41b9bd2941 100644 --- a/dwitter-part-3/source_code_start/dwitter/views.py +++ b/dwitter-part-3/source_code_start/dwitter/views.py @@ -1,4 +1,5 @@ from django.shortcuts import render + from .models import Profile diff --git a/dwitter-part-3/source_code_start/social/urls.py b/dwitter-part-3/source_code_start/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-3/source_code_start/social/urls.py +++ b/dwitter-part-3/source_code_start/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-3/source_code_step_07/dwitter/admin.py b/dwitter-part-3/source_code_step_07/dwitter/admin.py index 8d7433a1fa..f33641b88b 100644 --- a/dwitter-part-3/source_code_step_07/dwitter/admin.py +++ b/dwitter-part-3/source_code_step_07/dwitter/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User + from .models import Profile diff --git a/dwitter-part-3/source_code_step_07/dwitter/models.py b/dwitter-part-3/source_code_step_07/dwitter/models.py index 8b82a88b7f..a0d7bda6db 100644 --- a/dwitter-part-3/source_code_step_07/dwitter/models.py +++ b/dwitter-part-3/source_code_step_07/dwitter/models.py @@ -1,7 +1,7 @@ +from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver -from django.contrib.auth.models import User class Profile(models.Model): diff --git a/dwitter-part-3/source_code_step_07/dwitter/urls.py b/dwitter-part-3/source_code_step_07/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-3/source_code_step_07/dwitter/urls.py +++ b/dwitter-part-3/source_code_step_07/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-3/source_code_step_07/social/urls.py b/dwitter-part-3/source_code_step_07/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-3/source_code_step_07/social/urls.py +++ b/dwitter-part-3/source_code_step_07/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-3/source_code_step_08/dwitter/urls.py b/dwitter-part-3/source_code_step_08/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-3/source_code_step_08/dwitter/urls.py +++ b/dwitter-part-3/source_code_step_08/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-3/source_code_step_08/social/urls.py b/dwitter-part-3/source_code_step_08/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-3/source_code_step_08/social/urls.py +++ b/dwitter-part-3/source_code_step_08/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-3/source_code_step_09/dwitter/urls.py b/dwitter-part-3/source_code_step_09/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-3/source_code_step_09/dwitter/urls.py +++ b/dwitter-part-3/source_code_step_09/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-3/source_code_step_09/social/urls.py b/dwitter-part-3/source_code_step_09/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-3/source_code_step_09/social/urls.py +++ b/dwitter-part-3/source_code_step_09/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-4/source_code_final/dwitter/urls.py b/dwitter-part-4/source_code_final/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-4/source_code_final/dwitter/urls.py +++ b/dwitter-part-4/source_code_final/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-4/source_code_final/dwitter/views.py b/dwitter-part-4/source_code_final/dwitter/views.py index c74e028441..475abae13f 100644 --- a/dwitter-part-4/source_code_final/dwitter/views.py +++ b/dwitter-part-4/source_code_final/dwitter/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, redirect +from django.shortcuts import redirect, render from .forms import DweetForm from .models import Dweet, Profile diff --git a/dwitter-part-4/source_code_final/social/urls.py b/dwitter-part-4/source_code_final/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-4/source_code_final/social/urls.py +++ b/dwitter-part-4/source_code_final/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-4/source_code_start/dwitter/urls.py b/dwitter-part-4/source_code_start/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-4/source_code_start/dwitter/urls.py +++ b/dwitter-part-4/source_code_start/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-4/source_code_start/social/urls.py b/dwitter-part-4/source_code_start/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-4/source_code_start/social/urls.py +++ b/dwitter-part-4/source_code_start/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-4/source_code_step_10/dwitter/urls.py b/dwitter-part-4/source_code_step_10/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-4/source_code_step_10/dwitter/urls.py +++ b/dwitter-part-4/source_code_step_10/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-4/source_code_step_10/social/urls.py b/dwitter-part-4/source_code_step_10/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-4/source_code_step_10/social/urls.py +++ b/dwitter-part-4/source_code_step_10/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-4/source_code_step_11/dwitter/urls.py b/dwitter-part-4/source_code_step_11/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-4/source_code_step_11/dwitter/urls.py +++ b/dwitter-part-4/source_code_step_11/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-4/source_code_step_11/social/urls.py b/dwitter-part-4/source_code_step_11/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-4/source_code_step_11/social/urls.py +++ b/dwitter-part-4/source_code_step_11/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/dwitter-part-4/source_code_step_12/dwitter/urls.py b/dwitter-part-4/source_code_step_12/dwitter/urls.py index df34f0ad7a..6603eb01a1 100644 --- a/dwitter-part-4/source_code_step_12/dwitter/urls.py +++ b/dwitter-part-4/source_code_step_12/dwitter/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from .views import dashboard, profile_list, profile + +from .views import dashboard, profile, profile_list app_name = "dwitter" diff --git a/dwitter-part-4/source_code_step_12/dwitter/views.py b/dwitter-part-4/source_code_step_12/dwitter/views.py index c74e028441..475abae13f 100644 --- a/dwitter-part-4/source_code_step_12/dwitter/views.py +++ b/dwitter-part-4/source_code_step_12/dwitter/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, redirect +from django.shortcuts import redirect, render from .forms import DweetForm from .models import Dweet, Profile diff --git a/dwitter-part-4/source_code_step_12/social/urls.py b/dwitter-part-4/source_code_step_12/social/urls.py index e15361e794..766a3bb518 100644 --- a/dwitter-part-4/source_code_step_12/social/urls.py +++ b/dwitter-part-4/source_code_step_12/social/urls.py @@ -13,8 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin -from django.urls import path, include +from django.urls import include, path urlpatterns = [ path("", include("dwitter.urls")), diff --git a/emacs-the-best-python-editor/PyEval/expr_test.py b/emacs-the-best-python-editor/PyEval/expr_test.py index 43dd9bfbc1..3a15edfb4e 100644 --- a/emacs-the-best-python-editor/PyEval/expr_test.py +++ b/emacs-the-best-python-editor/PyEval/expr_test.py @@ -3,12 +3,13 @@ Jon Fincher, July 2018 """ + import unittest + from pyeval_expression import Expression class TestPyEval(unittest.TestCase): - """ Validation of Expression and Operator classes. No setup function is needed diff --git a/embedded-python/simon_says.py b/embedded-python/simon_says.py index 7c303dfb76..60feb46c9b 100644 --- a/embedded-python/simon_says.py +++ b/embedded-python/simon_says.py @@ -1,6 +1,7 @@ -from microbit import display, Image, accelerometer, sleep from random import randrange +from microbit import Image, accelerometer, display, sleep + # Define left, stay still and right directions = ["L", "O", "R"] points = 0 diff --git a/embeddings-and-vector-databases-with-chromadb/create_car_review_collection.py b/embeddings-and-vector-databases-with-chromadb/create_car_review_collection.py index 929c9a2522..3c57f49cbc 100644 --- a/embeddings-and-vector-databases-with-chromadb/create_car_review_collection.py +++ b/embeddings-and-vector-databases-with-chromadb/create_car_review_collection.py @@ -1,8 +1,7 @@ import chromadb -from chromadb.utils import embedding_functions - from car_data_etl import prepare_car_reviews_data from chroma_utils import build_chroma_collection +from chromadb.utils import embedding_functions DATA_PATH = "data/archive/*" CHROMA_PATH = "car_review_embeddings" diff --git a/embeddings-and-vector-databases-with-chromadb/text_embeddings.py b/embeddings-and-vector-databases-with-chromadb/text_embeddings.py index adce790e63..bb12abc5b4 100644 --- a/embeddings-and-vector-databases-with-chromadb/text_embeddings.py +++ b/embeddings-and-vector-databases-with-chromadb/text_embeddings.py @@ -1,6 +1,5 @@ -from sentence_transformers import SentenceTransformer - from cosine_similarity import compute_cosine_similarity +from sentence_transformers import SentenceTransformer model = SentenceTransformer("all-MiniLM-L6-v2") texts = [ diff --git a/embeddings-and-vector-databases-with-chromadb/word_vectors.py b/embeddings-and-vector-databases-with-chromadb/word_vectors.py index ccaed6e0a5..ae91ddd637 100644 --- a/embeddings-and-vector-databases-with-chromadb/word_vectors.py +++ b/embeddings-and-vector-databases-with-chromadb/word_vectors.py @@ -1,7 +1,7 @@ -import spacy - from cosine_similarity import compute_cosine_similarity +import spacy + # Load the medium-size English model nlp = spacy.load("en_core_web_md") diff --git a/fastapi-url-shortener/source_code_final/shortener_app/main.py b/fastapi-url-shortener/source_code_final/shortener_app/main.py index d9cd247f64..a3e11c326d 100644 --- a/fastapi-url-shortener/source_code_final/shortener_app/main.py +++ b/fastapi-url-shortener/source_code_final/shortener_app/main.py @@ -1,13 +1,12 @@ import validators - from fastapi import Depends, FastAPI, HTTPException, Request from fastapi.responses import RedirectResponse from sqlalchemy.orm import Session from starlette.datastructures import URL from . import crud, models, schemas -from .database import SessionLocal, engine from .config import get_settings +from .database import SessionLocal, engine app = FastAPI() models.Base.metadata.create_all(bind=engine) diff --git a/fastapi-url-shortener/source_code_step_2/shortener_app/main.py b/fastapi-url-shortener/source_code_step_2/shortener_app/main.py index f2875bc9c8..8915ef537c 100644 --- a/fastapi-url-shortener/source_code_step_2/shortener_app/main.py +++ b/fastapi-url-shortener/source_code_step_2/shortener_app/main.py @@ -1,6 +1,6 @@ import secrets -import validators +import validators from fastapi import Depends, FastAPI, HTTPException, Request from fastapi.responses import RedirectResponse from sqlalchemy.orm import Session diff --git a/fastapi-url-shortener/source_code_step_3/shortener_app/main.py b/fastapi-url-shortener/source_code_step_3/shortener_app/main.py index f5cd036383..f13f2adcc9 100644 --- a/fastapi-url-shortener/source_code_step_3/shortener_app/main.py +++ b/fastapi-url-shortener/source_code_step_3/shortener_app/main.py @@ -1,5 +1,4 @@ import validators - from fastapi import Depends, FastAPI, HTTPException, Request from fastapi.responses import RedirectResponse from sqlalchemy.orm import Session diff --git a/flask-connexion-rest-part-2/rp_flask_api/app.py b/flask-connexion-rest-part-2/rp_flask_api/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/flask-connexion-rest-part-2/rp_flask_api/app.py +++ b/flask-connexion-rest-part-2/rp_flask_api/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/flask-connexion-rest-part-2/rp_flask_api/people.py b/flask-connexion-rest-part-2/rp_flask_api/people.py index dfc2060910..49ae7ec950 100644 --- a/flask-connexion-rest-part-2/rp_flask_api/people.py +++ b/flask-connexion-rest-part-2/rp_flask_api/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/flask-connexion-rest-part-3/rp_flask_api/app.py b/flask-connexion-rest-part-3/rp_flask_api/app.py index 245b3119ce..4a74bd1bbc 100644 --- a/flask-connexion-rest-part-3/rp_flask_api/app.py +++ b/flask-connexion-rest-part-3/rp_flask_api/app.py @@ -1,6 +1,5 @@ -from flask import render_template - import config +from flask import render_template from models import Person app = config.connex_app diff --git a/flask-connexion-rest-part-3/rp_flask_api/models.py b/flask-connexion-rest-part-3/rp_flask_api/models.py index 273cd88889..e636812804 100644 --- a/flask-connexion-rest-part-3/rp_flask_api/models.py +++ b/flask-connexion-rest-part-3/rp_flask_api/models.py @@ -1,8 +1,7 @@ from datetime import datetime -from marshmallow_sqlalchemy import fields - from config import db, ma +from marshmallow_sqlalchemy import fields class Note(db.Model): diff --git a/flask-connexion-rest-part-3/rp_flask_api/notes.py b/flask-connexion-rest-part-3/rp_flask_api/notes.py index f02f0b2d0a..96763dee07 100644 --- a/flask-connexion-rest-part-3/rp_flask_api/notes.py +++ b/flask-connexion-rest-part-3/rp_flask_api/notes.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Note, Person, note_schema diff --git a/flask-connexion-rest-part-3/rp_flask_api/people.py b/flask-connexion-rest-part-3/rp_flask_api/people.py index dfc2060910..49ae7ec950 100644 --- a/flask-connexion-rest-part-3/rp_flask_api/people.py +++ b/flask-connexion-rest-part-3/rp_flask_api/people.py @@ -1,6 +1,5 @@ -from flask import abort, make_response - from config import db +from flask import abort, make_response from models import Person, people_schema, person_schema diff --git a/flask-connexion-rest-part-4/build_database.py b/flask-connexion-rest-part-4/build_database.py index feeb1d0534..04f4f4fc4a 100644 --- a/flask-connexion-rest-part-4/build_database.py +++ b/flask-connexion-rest-part-4/build_database.py @@ -1,7 +1,8 @@ import os from datetime import datetime + from config import db -from models import Person, Note +from models import Note, Person # Data to initialize database with PEOPLE = [ diff --git a/flask-connexion-rest-part-4/config.py b/flask-connexion-rest-part-4/config.py index 002cd2a481..14fa205589 100644 --- a/flask-connexion-rest-part-4/config.py +++ b/flask-connexion-rest-part-4/config.py @@ -1,7 +1,8 @@ import os + import connexion -from flask_sqlalchemy import SQLAlchemy from flask_marshmallow import Marshmallow +from flask_sqlalchemy import SQLAlchemy basedir = os.path.abspath(os.path.dirname(__file__)) diff --git a/flask-connexion-rest-part-4/models.py b/flask-connexion-rest-part-4/models.py index 7e970977eb..aa0b5ba58b 100644 --- a/flask-connexion-rest-part-4/models.py +++ b/flask-connexion-rest-part-4/models.py @@ -1,4 +1,5 @@ from datetime import datetime + from config import db, ma from marshmallow import fields diff --git a/flask-connexion-rest-part-4/notes.py b/flask-connexion-rest-part-4/notes.py index 9e3805e146..dbb555dc7f 100644 --- a/flask-connexion-rest-part-4/notes.py +++ b/flask-connexion-rest-part-4/notes.py @@ -3,9 +3,9 @@ people data """ -from flask import make_response, abort from config import db -from models import Person, Note, NoteSchema +from flask import abort, make_response +from models import Note, NoteSchema, Person def read_all(): diff --git a/flask-connexion-rest-part-4/people.py b/flask-connexion-rest-part-4/people.py index 04fd0ccafb..6df04247b4 100644 --- a/flask-connexion-rest-part-4/people.py +++ b/flask-connexion-rest-part-4/people.py @@ -3,9 +3,9 @@ people data """ -from flask import make_response, abort from config import db -from models import Person, PersonSchema, Note +from flask import abort, make_response +from models import Note, Person, PersonSchema def read_all(): diff --git a/flask-connexion-rest-part-4/server.py b/flask-connexion-rest-part-4/server.py index 1fcbac807a..4c3f4a4d15 100644 --- a/flask-connexion-rest-part-4/server.py +++ b/flask-connexion-rest-part-4/server.py @@ -3,11 +3,9 @@ """ # 3rd party moudles -from flask import render_template - # Local modules import config - +from flask import render_template # Get the application instance connex_app = config.connex_app diff --git a/flask-database/board/__init__.py b/flask-database/board/__init__.py index eedb72d5bf..db21ae316d 100644 --- a/flask-database/board/__init__.py +++ b/flask-database/board/__init__.py @@ -1,8 +1,9 @@ import os + from dotenv import load_dotenv from flask import Flask -from board import pages, database, posts +from board import database, pages, posts load_dotenv() diff --git a/flask-database/board/database.py b/flask-database/board/database.py index 319f36da9b..5c70a24cda 100644 --- a/flask-database/board/database.py +++ b/flask-database/board/database.py @@ -1,4 +1,5 @@ import sqlite3 + import click from flask import current_app, g diff --git a/flask-google-login/app.py b/flask-google-login/app.py index f82eaed803..4866d62218 100644 --- a/flask-google-login/app.py +++ b/flask-google-login/app.py @@ -3,6 +3,11 @@ import os import sqlite3 +import requests + +# Internal imports +from db import init_db_command + # Third party libraries from flask import Flask, redirect, request, url_for from flask_login import ( @@ -13,10 +18,6 @@ logout_user, ) from oauthlib.oauth2 import WebApplicationClient -import requests - -# Internal imports -from db import init_db_command from user import User # Configuration diff --git a/flask-google-login/user.py b/flask-google-login/user.py index 483e6fd4da..973e784b0e 100644 --- a/flask-google-login/user.py +++ b/flask-google-login/user.py @@ -1,6 +1,5 @@ -from flask_login import UserMixin - from db import get_db +from flask_login import UserMixin class User(UserMixin): diff --git a/flask-logging/board/__init__.py b/flask-logging/board/__init__.py index 1c4d7ef534..0e1adf00d6 100644 --- a/flask-logging/board/__init__.py +++ b/flask-logging/board/__init__.py @@ -1,4 +1,5 @@ import os + from dotenv import load_dotenv from flask import Flask diff --git a/flask-logging/board/database.py b/flask-logging/board/database.py index 319f36da9b..5c70a24cda 100644 --- a/flask-logging/board/database.py +++ b/flask-logging/board/database.py @@ -1,4 +1,5 @@ import sqlite3 + import click from flask import current_app, g diff --git a/geoshops/nearbyshops/admin.py b/geoshops/nearbyshops/admin.py index 5d3ccfc706..45648a7722 100644 --- a/geoshops/nearbyshops/admin.py +++ b/geoshops/nearbyshops/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin from django.contrib.gis.admin import OSMGeoAdmin + from .models import Shop diff --git a/geoshops/nearbyshops/views.py b/geoshops/nearbyshops/views.py index 394a7fbe5b..a1a7e4b11f 100644 --- a/geoshops/nearbyshops/views.py +++ b/geoshops/nearbyshops/views.py @@ -1,7 +1,8 @@ # from django.shortcuts import render -from django.views import generic -from django.contrib.gis.geos import Point from django.contrib.gis.db.models.functions import Distance +from django.contrib.gis.geos import Point +from django.views import generic + from .models import Shop # hardcoded user location diff --git a/geoshops/shops/urls.py b/geoshops/shops/urls.py index 683d812ef8..8037f22647 100644 --- a/geoshops/shops/urls.py +++ b/geoshops/shops/urls.py @@ -13,8 +13,10 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path + from nearbyshops import views urlpatterns = [path("admin/", admin.site.urls), path("", views.Home.as_view())] diff --git a/hashtable/01_hashtable_prototype/02_insert_a_key_value_pair/test_hashtable.py b/hashtable/01_hashtable_prototype/02_insert_a_key_value_pair/test_hashtable.py index 483024477e..f1bf2f6b64 100644 --- a/hashtable/01_hashtable_prototype/02_insert_a_key_value_pair/test_hashtable.py +++ b/hashtable/01_hashtable_prototype/02_insert_a_key_value_pair/test_hashtable.py @@ -1,6 +1,6 @@ # test_hashtable.py -from hashtable import HashTable, BLANK +from hashtable import BLANK, HashTable def test_should_create_hashtable(): diff --git a/hashtable/01_hashtable_prototype/03_find_a_value_by_key/test_hashtable.py b/hashtable/01_hashtable_prototype/03_find_a_value_by_key/test_hashtable.py index 69164ecf04..0fcffdc8d6 100644 --- a/hashtable/01_hashtable_prototype/03_find_a_value_by_key/test_hashtable.py +++ b/hashtable/01_hashtable_prototype/03_find_a_value_by_key/test_hashtable.py @@ -2,7 +2,7 @@ import pytest -from hashtable import HashTable, BLANK +from hashtable import BLANK, HashTable @pytest.fixture diff --git a/hashtable/01_hashtable_prototype/04_delete_a_key_value_pair/test_hashtable.py b/hashtable/01_hashtable_prototype/04_delete_a_key_value_pair/test_hashtable.py index 4a7b353893..e5b0f6601d 100644 --- a/hashtable/01_hashtable_prototype/04_delete_a_key_value_pair/test_hashtable.py +++ b/hashtable/01_hashtable_prototype/04_delete_a_key_value_pair/test_hashtable.py @@ -2,7 +2,7 @@ import pytest -from hashtable import HashTable, BLANK +from hashtable import BLANK, HashTable @pytest.fixture diff --git a/hashtable/01_hashtable_prototype/05_update_the_value_of_an_existing_pair/test_hashtable.py b/hashtable/01_hashtable_prototype/05_update_the_value_of_an_existing_pair/test_hashtable.py index fd2973b36c..004aae77ea 100644 --- a/hashtable/01_hashtable_prototype/05_update_the_value_of_an_existing_pair/test_hashtable.py +++ b/hashtable/01_hashtable_prototype/05_update_the_value_of_an_existing_pair/test_hashtable.py @@ -2,7 +2,7 @@ import pytest -from hashtable import HashTable, BLANK +from hashtable import BLANK, HashTable @pytest.fixture diff --git a/hashtable/01_hashtable_prototype/06_get_the_key_value_pairs/hashtable.py b/hashtable/01_hashtable_prototype/06_get_the_key_value_pairs/hashtable.py index 552972729f..8f6d3ea73a 100644 --- a/hashtable/01_hashtable_prototype/06_get_the_key_value_pairs/hashtable.py +++ b/hashtable/01_hashtable_prototype/06_get_the_key_value_pairs/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/01_hashtable_prototype/07_use_defensive_copying/hashtable.py b/hashtable/01_hashtable_prototype/07_use_defensive_copying/hashtable.py index 378f0fea77..2b648b9a10 100644 --- a/hashtable/01_hashtable_prototype/07_use_defensive_copying/hashtable.py +++ b/hashtable/01_hashtable_prototype/07_use_defensive_copying/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/01_hashtable_prototype/08_get_the_keys_and_values/hashtable.py b/hashtable/01_hashtable_prototype/08_get_the_keys_and_values/hashtable.py index 20e5517e70..bc0a573efb 100644 --- a/hashtable/01_hashtable_prototype/08_get_the_keys_and_values/hashtable.py +++ b/hashtable/01_hashtable_prototype/08_get_the_keys_and_values/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/01_hashtable_prototype/09_report_the_hash_tables_length/hashtable.py b/hashtable/01_hashtable_prototype/09_report_the_hash_tables_length/hashtable.py index 63dcd8d8ee..bc7f755d77 100644 --- a/hashtable/01_hashtable_prototype/09_report_the_hash_tables_length/hashtable.py +++ b/hashtable/01_hashtable_prototype/09_report_the_hash_tables_length/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/01_hashtable_prototype/10_make_the_hash_table_iterable/hashtable.py b/hashtable/01_hashtable_prototype/10_make_the_hash_table_iterable/hashtable.py index 1c98eeede9..faa6dfdfff 100644 --- a/hashtable/01_hashtable_prototype/10_make_the_hash_table_iterable/hashtable.py +++ b/hashtable/01_hashtable_prototype/10_make_the_hash_table_iterable/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/01_hashtable_prototype/11_represent_the_hash_table_in_text/hashtable.py b/hashtable/01_hashtable_prototype/11_represent_the_hash_table_in_text/hashtable.py index b355d591a5..7dba5fe4fc 100644 --- a/hashtable/01_hashtable_prototype/11_represent_the_hash_table_in_text/hashtable.py +++ b/hashtable/01_hashtable_prototype/11_represent_the_hash_table_in_text/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/01_hashtable_prototype/12_test_the_equality_of_hash_tables/hashtable.py b/hashtable/01_hashtable_prototype/12_test_the_equality_of_hash_tables/hashtable.py index c23620f317..7ccbd05eba 100644 --- a/hashtable/01_hashtable_prototype/12_test_the_equality_of_hash_tables/hashtable.py +++ b/hashtable/01_hashtable_prototype/12_test_the_equality_of_hash_tables/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/02_linear_probing/hashtable.py b/hashtable/02_linear_probing/hashtable.py index 2a0f4bd0a4..17ba0e5398 100644 --- a/hashtable/02_linear_probing/hashtable.py +++ b/hashtable/02_linear_probing/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple DELETED = object() diff --git a/hashtable/02_linear_probing/test_hashtable.py b/hashtable/02_linear_probing/test_hashtable.py index e1f6df4f09..291e9baa61 100644 --- a/hashtable/02_linear_probing/test_hashtable.py +++ b/hashtable/02_linear_probing/test_hashtable.py @@ -5,7 +5,7 @@ import pytest from pytest_unordered import unordered -from hashtable import HashTable, DELETED +from hashtable import DELETED, HashTable @pytest.fixture diff --git a/hashtable/03_autoresize/hashtable.py b/hashtable/03_autoresize/hashtable.py index 0602155685..77b8963761 100644 --- a/hashtable/03_autoresize/hashtable.py +++ b/hashtable/03_autoresize/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple DELETED = object() diff --git a/hashtable/03_autoresize/test_hashtable.py b/hashtable/03_autoresize/test_hashtable.py index ecb6f5ac9f..91a879ba77 100644 --- a/hashtable/03_autoresize/test_hashtable.py +++ b/hashtable/03_autoresize/test_hashtable.py @@ -5,7 +5,7 @@ import pytest from pytest_unordered import unordered -from hashtable import HashTable, DELETED +from hashtable import DELETED, HashTable @pytest.fixture diff --git a/hashtable/04_load_factor/hashtable.py b/hashtable/04_load_factor/hashtable.py index 316ca054b7..e440e16b5a 100644 --- a/hashtable/04_load_factor/hashtable.py +++ b/hashtable/04_load_factor/hashtable.py @@ -1,6 +1,6 @@ # hashtable.py -from typing import NamedTuple, Any +from typing import Any, NamedTuple DELETED = object() diff --git a/hashtable/04_load_factor/test_hashtable.py b/hashtable/04_load_factor/test_hashtable.py index b3b8f12f7f..bb64940a5f 100644 --- a/hashtable/04_load_factor/test_hashtable.py +++ b/hashtable/04_load_factor/test_hashtable.py @@ -5,7 +5,7 @@ import pytest from pytest_unordered import unordered -from hashtable import HashTable, DELETED +from hashtable import DELETED, HashTable @pytest.fixture diff --git a/hashtable/05_separate_chaining/hashtable.py b/hashtable/05_separate_chaining/hashtable.py index 7eb97b44b1..7ff3754c94 100644 --- a/hashtable/05_separate_chaining/hashtable.py +++ b/hashtable/05_separate_chaining/hashtable.py @@ -1,7 +1,7 @@ # hashtable.py from collections import deque -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/hashtable/06_insertion_order/hashtable.py b/hashtable/06_insertion_order/hashtable.py index 63dcf5412b..59e0d0ab2f 100644 --- a/hashtable/06_insertion_order/hashtable.py +++ b/hashtable/06_insertion_order/hashtable.py @@ -1,7 +1,7 @@ # hashtable.py from collections import deque -from typing import NamedTuple, Any +from typing import Any, NamedTuple class Pair(NamedTuple): diff --git a/histograms/histograms.py b/histograms/histograms.py index 57dcad9775..c9f08ffa12 100644 --- a/histograms/histograms.py +++ b/histograms/histograms.py @@ -11,16 +11,16 @@ $ python3 -i ./histograms.py """ -from collections import Counter import random import sys import warnings +from collections import Counter import matplotlib.pyplot as plt import numpy as np import pandas as pd -from scipy import stats import seaborn as sns +from scipy import stats print(__doc__) diff --git a/how-to-check-if-a-python-string-contains-a-substring/pandas_search.py b/how-to-check-if-a-python-string-contains-a-substring/pandas_search.py index 695fac1de8..2d8663f1b1 100644 --- a/how-to-check-if-a-python-string-contains-a-substring/pandas_search.py +++ b/how-to-check-if-a-python-string-contains-a-substring/pandas_search.py @@ -1,6 +1,5 @@ import pandas as pd - # Read the CSV data into a pandas dataframe companies = pd.read_csv("companies.csv") diff --git a/how-to-check-if-a-python-string-contains-a-substring/regex_search.py b/how-to-check-if-a-python-string-contains-a-substring/regex_search.py index abf8a21e74..8a9e95bcd2 100644 --- a/how-to-check-if-a-python-string-contains-a-substring/regex_search.py +++ b/how-to-check-if-a-python-string-contains-a-substring/regex_search.py @@ -1,6 +1,5 @@ import re - file_content = """hi there and welcome. this is a special hidden file with a secret secret. i don't want to tell you the secret, diff --git a/inheritance-and-composition/choosing/employees.py b/inheritance-and-composition/choosing/employees.py index ca4ea55492..9967bf0710 100644 --- a/inheritance-and-composition/choosing/employees.py +++ b/inheritance-and-composition/choosing/employees.py @@ -1,6 +1,6 @@ -from productivity import get_role -from hr import get_policy from contacts import get_employee_address +from hr import get_policy +from productivity import get_role from representations import AsDictionaryMixin diff --git a/inheritance-and-composition/choosing/program.py b/inheritance-and-composition/choosing/program.py index eca2e9cc16..3f654f1651 100644 --- a/inheritance-and-composition/choosing/program.py +++ b/inheritance-and-composition/choosing/program.py @@ -1,6 +1,6 @@ -from hr import calculate_payroll, LTDPolicy -from productivity import track from employees import employee_database +from hr import LTDPolicy, calculate_payroll +from productivity import track employees = employee_database.employees diff --git a/inheritance-and-composition/composition/employees.py b/inheritance-and-composition/composition/employees.py index 21928126b4..a4cda3af5f 100644 --- a/inheritance-and-composition/composition/employees.py +++ b/inheritance-and-composition/composition/employees.py @@ -1,6 +1,6 @@ -from productivity import ProductivitySystem -from hr import PayrollSystem from contacts import AddressBook +from hr import PayrollSystem +from productivity import ProductivitySystem class EmployeeDatabase: diff --git a/inheritance-and-composition/composition/program.py b/inheritance-and-composition/composition/program.py index 94ef796802..0c95d55474 100644 --- a/inheritance-and-composition/composition/program.py +++ b/inheritance-and-composition/composition/program.py @@ -1,6 +1,6 @@ -from hr import PayrollSystem, HourlyPolicy -from productivity import ProductivitySystem from employees import EmployeeDatabase +from hr import HourlyPolicy, PayrollSystem +from productivity import ProductivitySystem productivity_system = ProductivitySystem() payroll_system = PayrollSystem() diff --git a/inheritance-and-composition/inheritance/employees.py b/inheritance-and-composition/inheritance/employees.py index c9a84946fd..d909f3ce65 100644 --- a/inheritance-and-composition/inheritance/employees.py +++ b/inheritance-and-composition/inheritance/employees.py @@ -1,5 +1,5 @@ -from hr import SalaryPolicy, CommissionPolicy, HourlyPolicy -from productivity import ManagerRole, SecretaryRole, SalesRole, FactoryRole +from hr import CommissionPolicy, HourlyPolicy, SalaryPolicy +from productivity import FactoryRole, ManagerRole, SalesRole, SecretaryRole class Employee: diff --git a/inheritance-and-composition/inheritance/program.py b/inheritance-and-composition/inheritance/program.py index 232aa645b7..f72ae46abd 100644 --- a/inheritance-and-composition/inheritance/program.py +++ b/inheritance-and-composition/inheritance/program.py @@ -1,5 +1,5 @@ -import hr import employees +import hr import productivity manager = employees.Manager(1, "Mary Poppins", 3000) diff --git a/intro-to-bokeh/code-snippets/bokeh-template.py b/intro-to-bokeh/code-snippets/bokeh-template.py index 59f9b3a54b..cb5aa9b3f9 100644 --- a/intro-to-bokeh/code-snippets/bokeh-template.py +++ b/intro-to-bokeh/code-snippets/bokeh-template.py @@ -3,6 +3,7 @@ This template is a general outline for turning your data into a visualization using Bokeh. """ + # Data handling import pandas as pd # noqa import numpy as np # noqa diff --git a/intro-to-bokeh/code-snippets/east-top-2-race-v0.py b/intro-to-bokeh/code-snippets/east-top-2-race-v0.py index e719a57871..a50c191f2b 100644 --- a/intro-to-bokeh/code-snippets/east-top-2-race-v0.py +++ b/intro-to-bokeh/code-snippets/east-top-2-race-v0.py @@ -1,7 +1,7 @@ # Bokeh libraries -from bokeh.plotting import figure, show from bokeh.io import output_file -from bokeh.models import ColumnDataSource, CDSView, GroupFilter +from bokeh.models import CDSView, ColumnDataSource, GroupFilter +from bokeh.plotting import figure, show # Output to file output_file( diff --git a/intro-to-bokeh/code-snippets/east-west-column-layout.py b/intro-to-bokeh/code-snippets/east-west-column-layout.py index ba500bdef2..17146aec48 100644 --- a/intro-to-bokeh/code-snippets/east-west-column-layout.py +++ b/intro-to-bokeh/code-snippets/east-west-column-layout.py @@ -1,7 +1,7 @@ # Bokeh library -from bokeh.plotting import show from bokeh.io import output_file from bokeh.layouts import column +from bokeh.plotting import show # Output to file output_file( diff --git a/intro-to-bokeh/code-snippets/east-west-layout-prep.py b/intro-to-bokeh/code-snippets/east-west-layout-prep.py index 416d832c0a..6e07bc9de8 100644 --- a/intro-to-bokeh/code-snippets/east-west-layout-prep.py +++ b/intro-to-bokeh/code-snippets/east-west-layout-prep.py @@ -1,6 +1,6 @@ # Bokeh libraries +from bokeh.models import CDSView, ColumnDataSource, GroupFilter from bokeh.plotting import figure -from bokeh.models import ColumnDataSource, CDSView, GroupFilter # Create a ColumnDataSource standings_cds = ColumnDataSource(standings) # noqa diff --git a/intro-to-bokeh/code-snippets/east-west-tabbed-layout.py b/intro-to-bokeh/code-snippets/east-west-tabbed-layout.py index 4846f592d4..6e3b87dfe9 100644 --- a/intro-to-bokeh/code-snippets/east-west-tabbed-layout.py +++ b/intro-to-bokeh/code-snippets/east-west-tabbed-layout.py @@ -1,6 +1,6 @@ # Bokeh Library from bokeh.io import output_file -from bokeh.models.widgets import Tabs, Panel +from bokeh.models.widgets import Panel, Tabs # Output to file output_file( diff --git a/intro-to-bokeh/code-snippets/interactive-legend.py b/intro-to-bokeh/code-snippets/interactive-legend.py index 2948df05d8..178a339bc5 100644 --- a/intro-to-bokeh/code-snippets/interactive-legend.py +++ b/intro-to-bokeh/code-snippets/interactive-legend.py @@ -1,8 +1,8 @@ # Bokeh Libraries -from bokeh.plotting import figure, show from bokeh.io import output_file -from bokeh.models import ColumnDataSource, CDSView, GroupFilter from bokeh.layouts import row +from bokeh.models import CDSView, ColumnDataSource, GroupFilter +from bokeh.plotting import figure, show # Output inline in the notebook output_file("lebron-vs-durant.html", title="LeBron James vs. Kevin Durant") diff --git a/intro-to-bokeh/code-snippets/linked-axes.py b/intro-to-bokeh/code-snippets/linked-axes.py index bc1a6afe91..f97fc88a77 100644 --- a/intro-to-bokeh/code-snippets/linked-axes.py +++ b/intro-to-bokeh/code-snippets/linked-axes.py @@ -1,8 +1,8 @@ # Bokeh Libraries -from bokeh.plotting import figure, show from bokeh.io import output_file -from bokeh.models import ColumnDataSource, CategoricalColorMapper, Div -from bokeh.layouts import gridplot, column +from bokeh.layouts import column, gridplot +from bokeh.models import CategoricalColorMapper, ColumnDataSource, Div +from bokeh.plotting import figure, show # Output to file output_file("phi-gm-linked-stats.html", title="76ers Game Log") diff --git a/intro-to-bokeh/code-snippets/linked-selection.py b/intro-to-bokeh/code-snippets/linked-selection.py index 745457a15c..8aac73a6a1 100644 --- a/intro-to-bokeh/code-snippets/linked-selection.py +++ b/intro-to-bokeh/code-snippets/linked-selection.py @@ -1,12 +1,12 @@ # Bokeh Libraries -from bokeh.plotting import figure, show from bokeh.io import output_file +from bokeh.layouts import gridplot from bokeh.models import ( - ColumnDataSource, CategoricalColorMapper, + ColumnDataSource, NumeralTickFormatter, ) -from bokeh.layouts import gridplot +from bokeh.plotting import figure, show # Output inline in the notebook output_file( diff --git a/intro-to-bokeh/code-snippets/selection-example.py b/intro-to-bokeh/code-snippets/selection-example.py index 84c3bb316b..c13a771bdd 100644 --- a/intro-to-bokeh/code-snippets/selection-example.py +++ b/intro-to-bokeh/code-snippets/selection-example.py @@ -1,7 +1,7 @@ # Bokeh Libraries -from bokeh.plotting import figure, show from bokeh.io import output_file from bokeh.models import ColumnDataSource, NumeralTickFormatter +from bokeh.plotting import figure, show # Output to file output_file( diff --git a/intro-to-bokeh/code-snippets/west-top-2-race-v0.py b/intro-to-bokeh/code-snippets/west-top-2-race-v0.py index 42a0aba790..ada0c88007 100644 --- a/intro-to-bokeh/code-snippets/west-top-2-race-v0.py +++ b/intro-to-bokeh/code-snippets/west-top-2-race-v0.py @@ -1,7 +1,7 @@ # Bokeh libraries -from bokeh.plotting import figure, show from bokeh.io import output_file from bokeh.models import ColumnDataSource +from bokeh.plotting import figure, show # Output to file output_file( diff --git a/intro-to-bokeh/code-snippets/west-top-2-race-v1.py b/intro-to-bokeh/code-snippets/west-top-2-race-v1.py index 23e61040d5..50a5ba01c5 100644 --- a/intro-to-bokeh/code-snippets/west-top-2-race-v1.py +++ b/intro-to-bokeh/code-snippets/west-top-2-race-v1.py @@ -1,7 +1,7 @@ # Bokeh libraries -from bokeh.plotting import figure, show from bokeh.io import output_file -from bokeh.models import ColumnDataSource, CDSView, GroupFilter +from bokeh.models import CDSView, ColumnDataSource, GroupFilter +from bokeh.plotting import figure, show # Output to file output_file( diff --git a/itertools-in-python3/sp500.py b/itertools-in-python3/sp500.py index 5661ae18b8..1b28d8a7f9 100644 --- a/itertools-in-python3/sp500.py +++ b/itertools-in-python3/sp500.py @@ -1,8 +1,8 @@ -from collections import namedtuple import csv -from datetime import datetime -import itertools as it import functools as ft +import itertools as it +from collections import namedtuple +from datetime import datetime class DataPoint(namedtuple("DataPoint", ["date", "value"])): diff --git a/itertools-in-python3/swimmers.py b/itertools-in-python3/swimmers.py index 748f29f0bd..e3a43aa4a9 100644 --- a/itertools-in-python3/swimmers.py +++ b/itertools-in-python3/swimmers.py @@ -1,8 +1,8 @@ -from collections import namedtuple import csv import datetime import itertools as it import statistics +from collections import namedtuple class Event(namedtuple("Event", ["stroke", "name", "time"])): diff --git a/langchain-rag-app/source_code_final/tests/async_agent_requests.py b/langchain-rag-app/source_code_final/tests/async_agent_requests.py index 7c9737a162..89194d56e4 100644 --- a/langchain-rag-app/source_code_final/tests/async_agent_requests.py +++ b/langchain-rag-app/source_code_final/tests/async_agent_requests.py @@ -23,7 +23,7 @@ async def make_bulk_requests(url, data): questions = [ "What is the current wait time at wallace-hamilton hospital?", "Which hospital has the shortest wait time?", - "At which hospitals are patients complaining about billing and insurance issues?", # noqa E501 + "At which hospitals are patients complaining about billing and insurance issues?", # E501 "What is the average duration in days for emergency visits?", "What are patients saying about the nursing staff at Castaneda-Hardy?", "What was the total billing amount charged to each payer for 2023?", @@ -34,7 +34,7 @@ async def make_bulk_requests(url, data): "Have any patients complained about noise?", "How much was billed for patient 789's stay?", "Which physician has billed the most to cigna?", - "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # noqa E501 + "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # E501 ] request_bodies = [{"text": q} for q in questions] diff --git a/langchain-rag-app/source_code_final/tests/sync_agent_requests.py b/langchain-rag-app/source_code_final/tests/sync_agent_requests.py index a4e523181e..0f81363f78 100644 --- a/langchain-rag-app/source_code_final/tests/sync_agent_requests.py +++ b/langchain-rag-app/source_code_final/tests/sync_agent_requests.py @@ -7,7 +7,7 @@ questions = [ "What is the current wait time at wallace-hamilton hospital?", "Which hospital has the shortest wait time?", - "At which hospitals are patients complaining about billing and insurance issues?", # noqa E501 + "At which hospitals are patients complaining about billing and insurance issues?", # E501 "What is the average duration in days for emergency visits?", "What are patients saying about the nursing staff at Castaneda-Hardy?", "What was the total billing amount charged to each payer for 2023?", @@ -18,7 +18,7 @@ "Have any patients complained about noise?", "How much was billed for patient 789's stay?", "Which physician has billed the most to cigna?", - "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # noqa E501 + "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # E501 ] request_bodies = [{"text": q} for q in questions] diff --git a/langchain-rag-app/source_code_step_5/tests/async_agent_requests.py b/langchain-rag-app/source_code_step_5/tests/async_agent_requests.py index 7c9737a162..89194d56e4 100644 --- a/langchain-rag-app/source_code_step_5/tests/async_agent_requests.py +++ b/langchain-rag-app/source_code_step_5/tests/async_agent_requests.py @@ -23,7 +23,7 @@ async def make_bulk_requests(url, data): questions = [ "What is the current wait time at wallace-hamilton hospital?", "Which hospital has the shortest wait time?", - "At which hospitals are patients complaining about billing and insurance issues?", # noqa E501 + "At which hospitals are patients complaining about billing and insurance issues?", # E501 "What is the average duration in days for emergency visits?", "What are patients saying about the nursing staff at Castaneda-Hardy?", "What was the total billing amount charged to each payer for 2023?", @@ -34,7 +34,7 @@ async def make_bulk_requests(url, data): "Have any patients complained about noise?", "How much was billed for patient 789's stay?", "Which physician has billed the most to cigna?", - "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # noqa E501 + "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # E501 ] request_bodies = [{"text": q} for q in questions] diff --git a/langchain-rag-app/source_code_step_5/tests/sync_agent_requests.py b/langchain-rag-app/source_code_step_5/tests/sync_agent_requests.py index a4e523181e..0f81363f78 100644 --- a/langchain-rag-app/source_code_step_5/tests/sync_agent_requests.py +++ b/langchain-rag-app/source_code_step_5/tests/sync_agent_requests.py @@ -7,7 +7,7 @@ questions = [ "What is the current wait time at wallace-hamilton hospital?", "Which hospital has the shortest wait time?", - "At which hospitals are patients complaining about billing and insurance issues?", # noqa E501 + "At which hospitals are patients complaining about billing and insurance issues?", # E501 "What is the average duration in days for emergency visits?", "What are patients saying about the nursing staff at Castaneda-Hardy?", "What was the total billing amount charged to each payer for 2023?", @@ -18,7 +18,7 @@ "Have any patients complained about noise?", "How much was billed for patient 789's stay?", "Which physician has billed the most to cigna?", - "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # noqa E501 + "Which state had the largest percent increase in medicaid visits from 2022 to 2023?", # E501 ] request_bodies = [{"text": q} for q in questions] diff --git a/mandelbrot-set-python/03_bw.py b/mandelbrot-set-python/03_bw.py index b1104eb8fa..dd49c3119e 100644 --- a/mandelbrot-set-python/03_bw.py +++ b/mandelbrot-set-python/03_bw.py @@ -1,6 +1,5 @@ -from PIL import Image - from mandelbrot_01 import MandelbrotSet +from PIL import Image if __name__ == "__main__": diff --git a/mandelbrot-set-python/04_grayscale.py b/mandelbrot-set-python/04_grayscale.py index ab80846ba8..f15236a33b 100644 --- a/mandelbrot-set-python/04_grayscale.py +++ b/mandelbrot-set-python/04_grayscale.py @@ -1,6 +1,5 @@ -from PIL import Image - from mandelbrot_02 import MandelbrotSet +from PIL import Image if __name__ == "__main__": diff --git a/mandelbrot-set-python/05_grayscale_smooth.py b/mandelbrot-set-python/05_grayscale_smooth.py index 06897c0961..f9d8061e75 100644 --- a/mandelbrot-set-python/05_grayscale_smooth.py +++ b/mandelbrot-set-python/05_grayscale_smooth.py @@ -1,6 +1,5 @@ -from PIL import Image - from mandelbrot_03 import MandelbrotSet +from PIL import Image if __name__ == "__main__": diff --git a/mandelbrot-set-python/06_viewport_pixel.py b/mandelbrot-set-python/06_viewport_pixel.py index 9ff3388e01..6d98304460 100644 --- a/mandelbrot-set-python/06_viewport_pixel.py +++ b/mandelbrot-set-python/06_viewport_pixel.py @@ -1,7 +1,5 @@ -from PIL import Image -from PIL import ImageEnhance - from mandelbrot_03 import MandelbrotSet +from PIL import Image, ImageEnhance from viewport import Viewport if __name__ == "__main__": diff --git a/mandelbrot-set-python/07_color_palette_matplotlib.py b/mandelbrot-set-python/07_color_palette_matplotlib.py index 3b3994144c..6699b926af 100644 --- a/mandelbrot-set-python/07_color_palette_matplotlib.py +++ b/mandelbrot-set-python/07_color_palette_matplotlib.py @@ -1,7 +1,6 @@ import matplotlib.cm -from PIL import Image - from mandelbrot_03 import MandelbrotSet +from PIL import Image from viewport import Viewport diff --git a/mandelbrot-set-python/08_color_palette_custom.py b/mandelbrot-set-python/08_color_palette_custom.py index 0dc1fd9ab2..354821bea0 100644 --- a/mandelbrot-set-python/08_color_palette_custom.py +++ b/mandelbrot-set-python/08_color_palette_custom.py @@ -1,6 +1,5 @@ -from PIL import Image - from mandelbrot_03 import MandelbrotSet +from PIL import Image from viewport import Viewport diff --git a/mandelbrot-set-python/09_color_gradient.py b/mandelbrot-set-python/09_color_gradient.py index 30788919fa..932ccbd62b 100644 --- a/mandelbrot-set-python/09_color_gradient.py +++ b/mandelbrot-set-python/09_color_gradient.py @@ -1,8 +1,7 @@ import numpy as np +from mandelbrot_03 import MandelbrotSet from PIL import Image from scipy.interpolate import interp1d - -from mandelbrot_03 import MandelbrotSet from viewport import Viewport diff --git a/mandelbrot-set-python/10_color_hsb.py b/mandelbrot-set-python/10_color_hsb.py index ec012d6998..5e8281b3f7 100644 --- a/mandelbrot-set-python/10_color_hsb.py +++ b/mandelbrot-set-python/10_color_hsb.py @@ -1,7 +1,6 @@ +from mandelbrot_03 import MandelbrotSet from PIL import Image from PIL.ImageColor import getrgb - -from mandelbrot_03 import MandelbrotSet from viewport import Viewport diff --git a/mandelbrot-set-python/mandelbrot_03.py b/mandelbrot-set-python/mandelbrot_03.py index 26e66491c4..9702e0715e 100644 --- a/mandelbrot-set-python/mandelbrot_03.py +++ b/mandelbrot-set-python/mandelbrot_03.py @@ -1,6 +1,7 @@ # mandelbrot_03.py from __future__ import annotations # Union type syntax + from dataclasses import dataclass from math import log diff --git a/mandelbrot-set-python/viewport.py b/mandelbrot-set-python/viewport.py index 33918b40cf..48936516c5 100644 --- a/mandelbrot-set-python/viewport.py +++ b/mandelbrot-set-python/viewport.py @@ -1,6 +1,7 @@ # viewport.py from dataclasses import dataclass + from PIL import Image diff --git a/mvc-lego/create_db.py b/mvc-lego/create_db.py index 7deed809e6..f151f5e6ac 100644 --- a/mvc-lego/create_db.py +++ b/mvc-lego/create_db.py @@ -1,4 +1,5 @@ """Creates and seeds a SQLite example database.""" + import sqlite3 DATABASE = "./database.db" diff --git a/nearbyshops/nearbyshops/urls.py b/nearbyshops/nearbyshops/urls.py index 48d2c3255f..78f22415a8 100644 --- a/nearbyshops/nearbyshops/urls.py +++ b/nearbyshops/nearbyshops/urls.py @@ -13,9 +13,9 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path - from shops import views urlpatterns = [path("", views.Home.as_view()), path("admin/", admin.site.urls)] diff --git a/nearbyshops/shops/admin.py b/nearbyshops/shops/admin.py index d51ab717f9..53666b29ad 100644 --- a/nearbyshops/shops/admin.py +++ b/nearbyshops/shops/admin.py @@ -2,6 +2,7 @@ from django.contrib import admin from django.contrib.gis.admin import OSMGeoAdmin + from .models import Shop diff --git a/nearbyshops/shops/views.py b/nearbyshops/shops/views.py index 7da7e6006b..0f27cc30dd 100644 --- a/nearbyshops/shops/views.py +++ b/nearbyshops/shops/views.py @@ -1,6 +1,7 @@ -from django.views import generic -from django.contrib.gis.geos import Point from django.contrib.gis.db.models.functions import Distance +from django.contrib.gis.geos import Point +from django.views import generic + from .models import Shop longitude = -80.191_788 diff --git a/nlp-sentiment-analysis/sentiment_analyzer.py b/nlp-sentiment-analysis/sentiment_analyzer.py index f03bb30eb8..564fb4d308 100644 --- a/nlp-sentiment-analysis/sentiment_analyzer.py +++ b/nlp-sentiment-analysis/sentiment_analyzer.py @@ -1,9 +1,10 @@ import os import random -import spacy -from spacy.util import minibatch, compounding + import pandas as pd +import spacy +from spacy.util import compounding, minibatch TEST_REVIEW = """ Transcendently beautiful in moments outside the office, it seems almost diff --git a/numpy-rng/array_constraints.py b/numpy-rng/array_constraints.py index 95a81a8d2a..03e5dbb489 100644 --- a/numpy-rng/array_constraints.py +++ b/numpy-rng/array_constraints.py @@ -1,4 +1,4 @@ -from numpy.random import Generator, PCG64DXSM +from numpy.random import PCG64DXSM, Generator rng = Generator(PCG64DXSM()) diff --git a/numpy-rng/permutation_vs_shuffle.py b/numpy-rng/permutation_vs_shuffle.py index 1019920b8c..833eaebbf0 100644 --- a/numpy-rng/permutation_vs_shuffle.py +++ b/numpy-rng/permutation_vs_shuffle.py @@ -1,5 +1,4 @@ import numpy as np - from decks import create_high_cards NUMBER_OF_SUITES = 4 diff --git a/opencv-color-spaces/finding-nemo.py b/opencv-color-spaces/finding-nemo.py index 0b9115516e..015e1a5d9d 100644 --- a/opencv-color-spaces/finding-nemo.py +++ b/opencv-color-spaces/finding-nemo.py @@ -4,13 +4,11 @@ """ import cv2 -import numpy as np - import matplotlib.pyplot as plt +import numpy as np from matplotlib import colors - -from mpl_toolkits.mplot3d import Axes3D # noqa from matplotlib.colors import hsv_to_rgb +from mpl_toolkits.mplot3d import Axes3D # noqa # To get a list of all the possible colour conversions diff --git a/pandas-fast-flexible-intuitive/tutorial/__main__.py b/pandas-fast-flexible-intuitive/tutorial/__main__.py index ee48944e7f..5507ae0b38 100644 --- a/pandas-fast-flexible-intuitive/tutorial/__main__.py +++ b/pandas-fast-flexible-intuitive/tutorial/__main__.py @@ -87,10 +87,10 @@ def apply_tariff_isin(df): df.loc[peak_hours, "cost_cents"] = df.loc[peak_hours, "energy_kwh"] * 28 df.loc[shoulder_hours, "cost_cents"] = ( df.loc[shoulder_hours, "energy_kwh"] * 20 - ) # noqa + ) df.loc[off_peak_hours, "cost_cents"] = ( df.loc[off_peak_hours, "energy_kwh"] * 12 - ) # noqa + ) @timeit(repeat=3, number=1000) diff --git a/pandas-gradebook-project/01-loading-the-data.py b/pandas-gradebook-project/01-loading-the-data.py index be43f126a4..907724ed42 100644 --- a/pandas-gradebook-project/01-loading-the-data.py +++ b/pandas-gradebook-project/01-loading-the-data.py @@ -8,7 +8,9 @@ to calculate final grades for a class. """ + from pathlib import Path + import pandas as pd HERE = Path(__file__).parent diff --git a/pandas-gradebook-project/02-merging-dataframes.py b/pandas-gradebook-project/02-merging-dataframes.py index b7f2cc45de..827d38c53a 100644 --- a/pandas-gradebook-project/02-merging-dataframes.py +++ b/pandas-gradebook-project/02-merging-dataframes.py @@ -8,7 +8,9 @@ to calculate final grades for a class. """ + from pathlib import Path + import pandas as pd HERE = Path(__file__).parent diff --git a/pandas-gradebook-project/03-calculating-grades.py b/pandas-gradebook-project/03-calculating-grades.py index bac6bc3d0d..0caad5bad1 100644 --- a/pandas-gradebook-project/03-calculating-grades.py +++ b/pandas-gradebook-project/03-calculating-grades.py @@ -8,9 +8,11 @@ to calculate final grades for a class. """ + from pathlib import Path -import pandas as pd + import numpy as np +import pandas as pd HERE = Path(__file__).parent DATA_FOLDER = HERE / "data" diff --git a/pandas-gradebook-project/04-grouping-the-data.py b/pandas-gradebook-project/04-grouping-the-data.py index f7d5a79dee..4a371b2646 100644 --- a/pandas-gradebook-project/04-grouping-the-data.py +++ b/pandas-gradebook-project/04-grouping-the-data.py @@ -8,9 +8,11 @@ to calculate final grades for a class. """ + from pathlib import Path -import pandas as pd + import numpy as np +import pandas as pd HERE = Path(__file__).parent DATA_FOLDER = HERE / "data" diff --git a/pandas-gradebook-project/05-plotting-summary-statistics.py b/pandas-gradebook-project/05-plotting-summary-statistics.py index 5c250d707e..ffcc5f07a5 100644 --- a/pandas-gradebook-project/05-plotting-summary-statistics.py +++ b/pandas-gradebook-project/05-plotting-summary-statistics.py @@ -8,10 +8,12 @@ to calculate final grades for a class. """ + from pathlib import Path -import pandas as pd -import numpy as np + import matplotlib.pyplot as plt +import numpy as np +import pandas as pd import scipy.stats HERE = Path(__file__).parent diff --git a/pandas-gradebook-project/06-final-gradebook.py b/pandas-gradebook-project/06-final-gradebook.py index b86fa21506..8036b4d258 100644 --- a/pandas-gradebook-project/06-final-gradebook.py +++ b/pandas-gradebook-project/06-final-gradebook.py @@ -8,10 +8,12 @@ to calculate final grades for a class. """ + from pathlib import Path -import pandas as pd -import numpy as np + import matplotlib.pyplot as plt +import numpy as np +import pandas as pd import scipy.stats HERE = Path(__file__).parent diff --git a/pandas-gradebook-project/data/generate_data.py b/pandas-gradebook-project/data/generate_data.py index 358db2dafe..8918c859a1 100644 --- a/pandas-gradebook-project/data/generate_data.py +++ b/pandas-gradebook-project/data/generate_data.py @@ -1,13 +1,15 @@ """Generate random data for the project.""" -from dataclasses import dataclass, field, asdict -from typing import Optional -from random import choice, seed as py_rand_seed + +from dataclasses import asdict, dataclass, field from pathlib import Path +from random import choice +from random import seed as py_rand_seed +from typing import Optional import numpy as np -from faker import Faker import pandas as pd from dateutil import parser, rrule +from faker import Faker fake = Faker() diff --git a/pep8-beautiful-code/trailing_whitespace.py b/pep8-beautiful-code/trailing_whitespace.py index 23a3bbfef2..28b5b1ee6f 100644 --- a/pep8-beautiful-code/trailing_whitespace.py +++ b/pep8-beautiful-code/trailing_whitespace.py @@ -1,7 +1,7 @@ # Uncomment the code below # for an example of code with a trailing whitespace: -# x = 1 + 2 + \ # noqa w291 +# x = 1 + 2 + \ # w291 # 3 + 4 # print(x) diff --git a/primer-on-python-decorators/secret_app.py b/primer-on-python-decorators/secret_app.py index 02c6557c44..22551964b7 100644 --- a/primer-on-python-decorators/secret_app.py +++ b/primer-on-python-decorators/secret_app.py @@ -1,5 +1,6 @@ import functools -from flask import Flask, g, request, redirect, url_for + +from flask import Flask, g, redirect, request, url_for app = Flask(__name__) @@ -18,5 +19,4 @@ def wrapper_login_required(*args, **kwargs): @app.route("/secret") @login_required -def secret(): - ... +def secret(): ... diff --git a/pygame-a-primer/py_tut_with_images.py b/pygame-a-primer/py_tut_with_images.py index ee33a3bea8..18d96a5e0b 100644 --- a/pygame-a-primer/py_tut_with_images.py +++ b/pygame-a-primer/py_tut_with_images.py @@ -1,21 +1,21 @@ # Import the pygame module -import pygame - # Import random for random numbers import random +import pygame + # Import pygame.locals for easier access to key coordinates # Updated to conform to flake8 and black standards # from pygame.locals import * from pygame.locals import ( - RLEACCEL, - K_UP, K_DOWN, + K_ESCAPE, K_LEFT, K_RIGHT, - K_ESCAPE, + K_UP, KEYDOWN, QUIT, + RLEACCEL, ) # Define constants for the screen width and height diff --git a/pygame-a-primer/py_tutfinal.py b/pygame-a-primer/py_tutfinal.py index 5da2a311f6..e2c534c38b 100644 --- a/pygame-a-primer/py_tutfinal.py +++ b/pygame-a-primer/py_tutfinal.py @@ -1,17 +1,17 @@ # Import the pygame module -import pygame - # Import random for random numbers import random +import pygame + # Import pygame.locals for easier access to key coordinates # Updated to conform to flake8 and black standards from pygame.locals import ( - K_UP, K_DOWN, + K_ESCAPE, K_LEFT, K_RIGHT, - K_ESCAPE, + K_UP, KEYDOWN, QUIT, ) diff --git a/pyproject.toml b/pyproject.toml index 2f44f8c4a7..36c49fd131 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 79 -target-version = ["py310"] +target-version = ["py312"] exclude = ''' /( \.git @@ -9,3 +9,12 @@ exclude = ''' | node_modules )/ ''' + + +[tool.ruff] +target-version = "py312" +exclude = [".git", "venv", "migrations", "node_modules"] + +[tool.ruff.lint] +select = ["E", "F", "I", "RUF100"] +ignore = ["E501"] # Line length is controlled by Black diff --git a/python-311/ndarray.py b/python-311/ndarray.py index 7a5d71a4cf..727620adc4 100644 --- a/python-311/ndarray.py +++ b/python-311/ndarray.py @@ -3,8 +3,7 @@ Ts = TypeVarTuple("Ts") -class Array(Generic[*Ts]): - ... # Not implemented here +class Array(Generic[*Ts]): ... # Not implemented here Height = NewType("Height", int) diff --git a/python-311/units.py b/python-311/units.py index 3d0f92f763..7e0b47716c 100644 --- a/python-311/units.py +++ b/python-311/units.py @@ -1,5 +1,4 @@ import pathlib - import tomllib with pathlib.Path("units.toml").open(mode="rb") as file: diff --git a/python-bindings/ctypes_c_test.py b/python-bindings/ctypes_c_test.py index 084df7d542..947cdf1e27 100644 --- a/python-bindings/ctypes_c_test.py +++ b/python-bindings/ctypes_c_test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python """ Simple examples of calling C functions through ctypes module. """ import ctypes -import sys import pathlib +import sys if __name__ == "__main__": libname = pathlib.Path().absolute() diff --git a/python-bindings/ctypes_cpp_test.py b/python-bindings/ctypes_cpp_test.py index db11caf724..5a044b94cb 100644 --- a/python-bindings/ctypes_cpp_test.py +++ b/python-bindings/ctypes_cpp_test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python """ Simple examples of calling C functions through ctypes module. """ import ctypes -import sys import pathlib +import sys if __name__ == "__main__": libname = pathlib.Path().absolute() diff --git a/python-bindings/tasks.py b/python-bindings/tasks.py index 4ccc1f4af2..2faeaac2c5 100644 --- a/python-bindings/tasks.py +++ b/python-bindings/tasks.py @@ -1,14 +1,16 @@ """ Task definitions for invoke command line utility for python bindings overview article. """ -import cffi -import invoke -import pathlib -import sys + +import glob import os -import shutil +import pathlib import re -import glob +import shutil +import sys + +import cffi +import invoke on_win = sys.platform.startswith("win") diff --git a/python-bitwise-operators/stegano/__main__.py b/python-bitwise-operators/stegano/__main__.py index b4732c0a63..f2971dd6c9 100644 --- a/python-bitwise-operators/stegano/__main__.py +++ b/python-bitwise-operators/stegano/__main__.py @@ -5,8 +5,8 @@ from .bitmap import Bitmap from .cli import CommandLineArguments, parse_args -from .decoder import decode, DecodingError -from .encoder import encode, EncodingError +from .decoder import DecodingError, decode +from .encoder import EncodingError, encode from .eraser import erase diff --git a/python-bitwise-operators/stegano/bitmap.py b/python-bitwise-operators/stegano/bitmap.py index cda7bc4536..a459268e04 100644 --- a/python-bitwise-operators/stegano/bitmap.py +++ b/python-bitwise-operators/stegano/bitmap.py @@ -5,9 +5,9 @@ import pathlib from dataclasses import dataclass from itertools import islice -from mmap import mmap, ACCESS_WRITE +from mmap import ACCESS_WRITE, mmap from struct import pack, unpack -from typing import Any, Union, Iterator +from typing import Any, Iterator, Union class Bitmap: diff --git a/python-class/point.py b/python-class/point.py index 3c8751a856..1cfcbe43e5 100644 --- a/python-class/point.py +++ b/python-class/point.py @@ -1,6 +1,5 @@ from dataclasses import dataclass - # Point with slots # class Point: # __slots__ = ("x", "y") diff --git a/python-contact-book/source_code_final/rpcontacts/database.py b/python-contact-book/source_code_final/rpcontacts/database.py index a705bcc2a8..6e0250a327 100644 --- a/python-contact-book/source_code_final/rpcontacts/database.py +++ b/python-contact-book/source_code_final/rpcontacts/database.py @@ -2,8 +2,8 @@ """This module provides a database connection.""" -from PyQt5.QtWidgets import QMessageBox from PyQt5.QtSql import QSqlDatabase, QSqlQuery +from PyQt5.QtWidgets import QMessageBox def _createContactsTable(): diff --git a/python-contact-book/source_code_step_3/rpcontacts/database.py b/python-contact-book/source_code_step_3/rpcontacts/database.py index a705bcc2a8..6e0250a327 100644 --- a/python-contact-book/source_code_step_3/rpcontacts/database.py +++ b/python-contact-book/source_code_step_3/rpcontacts/database.py @@ -2,8 +2,8 @@ """This module provides a database connection.""" -from PyQt5.QtWidgets import QMessageBox from PyQt5.QtSql import QSqlDatabase, QSqlQuery +from PyQt5.QtWidgets import QMessageBox def _createContactsTable(): diff --git a/python-contact-book/source_code_step_4/rpcontacts/database.py b/python-contact-book/source_code_step_4/rpcontacts/database.py index a705bcc2a8..6e0250a327 100644 --- a/python-contact-book/source_code_step_4/rpcontacts/database.py +++ b/python-contact-book/source_code_step_4/rpcontacts/database.py @@ -2,8 +2,8 @@ """This module provides a database connection.""" -from PyQt5.QtWidgets import QMessageBox from PyQt5.QtSql import QSqlDatabase, QSqlQuery +from PyQt5.QtWidgets import QMessageBox def _createContactsTable(): diff --git a/python-contact-book/source_code_step_5/rpcontacts/database.py b/python-contact-book/source_code_step_5/rpcontacts/database.py index a705bcc2a8..6e0250a327 100644 --- a/python-contact-book/source_code_step_5/rpcontacts/database.py +++ b/python-contact-book/source_code_step_5/rpcontacts/database.py @@ -2,8 +2,8 @@ """This module provides a database connection.""" -from PyQt5.QtWidgets import QMessageBox from PyQt5.QtSql import QSqlDatabase, QSqlQuery +from PyQt5.QtWidgets import QMessageBox def _createContactsTable(): diff --git a/python-contact-book/source_code_step_6/rpcontacts/database.py b/python-contact-book/source_code_step_6/rpcontacts/database.py index a705bcc2a8..6e0250a327 100644 --- a/python-contact-book/source_code_step_6/rpcontacts/database.py +++ b/python-contact-book/source_code_step_6/rpcontacts/database.py @@ -2,8 +2,8 @@ """This module provides a database connection.""" -from PyQt5.QtWidgets import QMessageBox from PyQt5.QtSql import QSqlDatabase, QSqlQuery +from PyQt5.QtWidgets import QMessageBox def _createContactsTable(): diff --git a/python-ellipsis/ellipsis_example.py b/python-ellipsis/ellipsis_example.py index 83b947745b..c43dd16bc5 100644 --- a/python-ellipsis/ellipsis_example.py +++ b/python-ellipsis/ellipsis_example.py @@ -1,5 +1,4 @@ -def do_nothing(): - ... +def do_nothing(): ... do_nothing() diff --git a/python-ellipsis/flask_stub_example/app.py b/python-ellipsis/flask_stub_example/app.py index fbc664db50..3e3e156f7b 100644 --- a/python-ellipsis/flask_stub_example/app.py +++ b/python-ellipsis/flask_stub_example/app.py @@ -1,13 +1,11 @@ -from flask import Flask - from custom_stats import count_visitor +from flask import Flask app = Flask(__name__) if app.debug: - def count_visitor(): # noqa: F811 - ... + def count_visitor(): ... @app.route("/") diff --git a/python-flask-example-heroku/app.py b/python-flask-example-heroku/app.py index a80c6dd6fb..2afffcecae 100644 --- a/python-flask-example-heroku/app.py +++ b/python-flask-example-heroku/app.py @@ -1,4 +1,5 @@ import os + from flask import Flask app = Flask(__name__) diff --git a/python-get-all-files-in-directory/create_large_dir.py b/python-get-all-files-in-directory/create_large_dir.py index 16dc3b12f7..2cf4623c49 100644 --- a/python-get-all-files-in-directory/create_large_dir.py +++ b/python-get-all-files-in-directory/create_large_dir.py @@ -3,7 +3,6 @@ from dataclasses import dataclass, field from pathlib import Path - NUM_JUNK_FILES_LARGE = 300 NUM_JUNK_FILES_MEDIUM = 25 NUM_JUNK_FILES_SMALL = 5 diff --git a/python-get-current-time/unix_time.py b/python-get-current-time/unix_time.py index 3176ae2813..bc16984578 100644 --- a/python-get-current-time/unix_time.py +++ b/python-get-current-time/unix_time.py @@ -1,6 +1,5 @@ -from datetime import datetime import time - +from datetime import datetime datetime_unixtime = datetime.now().timestamp() time_unixtime = time.time() diff --git a/python-get-current-time/with_time.py b/python-get-current-time/with_time.py index 1538cfe21b..24806e03aa 100644 --- a/python-get-current-time/with_time.py +++ b/python-get-current-time/with_time.py @@ -1,6 +1,5 @@ import time - print( f""" {time.time() = } diff --git a/python-heapq-module/shortest-path.py b/python-heapq-module/shortest-path.py index e5b2ce82de..791a6dba84 100644 --- a/python-heapq-module/shortest-path.py +++ b/python-heapq-module/shortest-path.py @@ -1,6 +1,5 @@ import heapq - map = """\ .......X.. .......X.. diff --git a/python-http-server/https/self_signed.py b/python-http-server/https/self_signed.py index 083649847b..98c6672711 100644 --- a/python-http-server/https/self_signed.py +++ b/python-http-server/https/self_signed.py @@ -36,7 +36,7 @@ def path(self) -> Path: subject.C = self.country subject.ST = self.state subject.L = self.locality - subject.O = self.organization # noqa + subject.O = self.organization subject.OU = self.organizational_unit certificate.set_serial_number(self.serial_number) diff --git a/python-import/finders_and_loaders/pip_importer.py b/python-import/finders_and_loaders/pip_importer.py index fe684c8e21..7ed8601fa1 100644 --- a/python-import/finders_and_loaders/pip_importer.py +++ b/python-import/finders_and_loaders/pip_importer.py @@ -1,8 +1,8 @@ # pip_importer.py -from importlib import util import subprocess import sys +from importlib import util class PipFinder: diff --git a/python-import/optional_color/countdown.py b/python-import/optional_color/countdown.py index 00454d5d06..eac0472c84 100644 --- a/python-import/optional_color/countdown.py +++ b/python-import/optional_color/countdown.py @@ -1,8 +1,9 @@ # countdown.py +import time + import optional_color from optional_color import Cursor, Fore -import time optional_color.init(autoreset=True) countdown = [f"{Fore.BLUE}{n}" for n in range(10, 0, -1)] diff --git a/python-import/optional_color/optional_color.py b/python-import/optional_color/optional_color.py index fb22b03c30..35390a8d64 100644 --- a/python-import/optional_color/optional_color.py +++ b/python-import/optional_color/optional_color.py @@ -1,7 +1,7 @@ # optional_color.py try: - from colorama import init, Back, Cursor, Fore, Style + from colorama import Back, Cursor, Fore, Style, init except ImportError: from collections import UserString diff --git a/python-interview-problems-parsing-csv/full_code/test_football_pandas.py b/python-interview-problems-parsing-csv/full_code/test_football_pandas.py index fa10ff30c4..cc8c555400 100644 --- a/python-interview-problems-parsing-csv/full_code/test_football_pandas.py +++ b/python-interview-problems-parsing-csv/full_code/test_football_pandas.py @@ -1,5 +1,5 @@ -import pytest import football_pandas as fb +import pytest @pytest.fixture diff --git a/python-interview-problems-parsing-csv/full_code/test_football_v1.py b/python-interview-problems-parsing-csv/full_code/test_football_v1.py index 7daba484cc..3534d470fe 100644 --- a/python-interview-problems-parsing-csv/full_code/test_football_v1.py +++ b/python-interview-problems-parsing-csv/full_code/test_football_v1.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Pytest functions for CSV Football problem """ -import pytest import football_v1 as fb +import pytest @pytest.fixture diff --git a/python-interview-problems-parsing-csv/full_code/test_football_v2.py b/python-interview-problems-parsing-csv/full_code/test_football_v2.py index 80dff27005..d3afdc5f42 100644 --- a/python-interview-problems-parsing-csv/full_code/test_football_v2.py +++ b/python-interview-problems-parsing-csv/full_code/test_football_v2.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Pytest functions for CSV Football problem """ -import pytest import football_v2 as fb +import pytest @pytest.fixture diff --git a/python-keyboard-input/sensitive.py b/python-keyboard-input/sensitive.py index 6b8aa2b5a0..7fe388b132 100644 --- a/python-keyboard-input/sensitive.py +++ b/python-keyboard-input/sensitive.py @@ -1,5 +1,5 @@ -import os import getpass +import os def verify_email(email): diff --git a/python-maze-solver/source_code_final/src/maze_solver/view/primitives.py b/python-maze-solver/source_code_final/src/maze_solver/view/primitives.py index 3fb716ba9e..5418a73c58 100644 --- a/python-maze-solver/source_code_final/src/maze_solver/view/primitives.py +++ b/python-maze-solver/source_code_final/src/maze_solver/view/primitives.py @@ -3,8 +3,7 @@ class Primitive(Protocol): - def draw(self, **attributes) -> str: - ... + def draw(self, **attributes) -> str: ... class NullPrimitive: diff --git a/python-maze-solver/source_code_step_3/src/maze_solver/view/primitives.py b/python-maze-solver/source_code_step_3/src/maze_solver/view/primitives.py index 5b2ab384fe..c23f089d9b 100644 --- a/python-maze-solver/source_code_step_3/src/maze_solver/view/primitives.py +++ b/python-maze-solver/source_code_step_3/src/maze_solver/view/primitives.py @@ -3,8 +3,7 @@ class Primitive(Protocol): - def draw(self, **attributes) -> str: - ... + def draw(self, **attributes) -> str: ... class NullPrimitive: diff --git a/python-maze-solver/source_code_step_4/src/maze_solver/view/primitives.py b/python-maze-solver/source_code_step_4/src/maze_solver/view/primitives.py index 5b2ab384fe..c23f089d9b 100644 --- a/python-maze-solver/source_code_step_4/src/maze_solver/view/primitives.py +++ b/python-maze-solver/source_code_step_4/src/maze_solver/view/primitives.py @@ -3,8 +3,7 @@ class Primitive(Protocol): - def draw(self, **attributes) -> str: - ... + def draw(self, **attributes) -> str: ... class NullPrimitive: diff --git a/python-microservices-with-grpc/marketplace/marketplace.py b/python-microservices-with-grpc/marketplace/marketplace.py index d6522e2678..368b57ed34 100644 --- a/python-microservices-with-grpc/marketplace/marketplace.py +++ b/python-microservices-with-grpc/marketplace/marketplace.py @@ -1,8 +1,7 @@ import os -from flask import Flask, render_template import grpc - +from flask import Flask, render_template from recommendations_pb2 import BookCategory, RecommendationRequest from recommendations_pb2_grpc import RecommendationsStub diff --git a/python-microservices-with-grpc/marketplace/recommendations_pb2.py b/python-microservices-with-grpc/marketplace/recommendations_pb2.py index 79e366b1d0..d22b890fbe 100644 --- a/python-microservices-with-grpc/marketplace/recommendations_pb2.py +++ b/python-microservices-with-grpc/marketplace/recommendations_pb2.py @@ -234,16 +234,16 @@ ) _RECOMMENDATIONREQUEST.fields_by_name["category"].enum_type = _BOOKCATEGORY -_RECOMMENDATIONRESPONSE.fields_by_name[ - "recommendations" -].message_type = _BOOKRECOMMENDATION -DESCRIPTOR.message_types_by_name[ - "RecommendationRequest" -] = _RECOMMENDATIONREQUEST +_RECOMMENDATIONRESPONSE.fields_by_name["recommendations"].message_type = ( + _BOOKRECOMMENDATION +) +DESCRIPTOR.message_types_by_name["RecommendationRequest"] = ( + _RECOMMENDATIONREQUEST +) DESCRIPTOR.message_types_by_name["BookRecommendation"] = _BOOKRECOMMENDATION -DESCRIPTOR.message_types_by_name[ - "RecommendationResponse" -] = _RECOMMENDATIONRESPONSE +DESCRIPTOR.message_types_by_name["RecommendationResponse"] = ( + _RECOMMENDATIONRESPONSE +) DESCRIPTOR.enum_types_by_name["BookCategory"] = _BOOKCATEGORY _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -252,7 +252,7 @@ (_message.Message,), { "DESCRIPTOR": _RECOMMENDATIONREQUEST, - "__module__": "recommendations_pb2" + "__module__": "recommendations_pb2", # @@protoc_insertion_point(class_scope:RecommendationRequest) }, ) @@ -263,7 +263,7 @@ (_message.Message,), { "DESCRIPTOR": _BOOKRECOMMENDATION, - "__module__": "recommendations_pb2" + "__module__": "recommendations_pb2", # @@protoc_insertion_point(class_scope:BookRecommendation) }, ) @@ -274,7 +274,7 @@ (_message.Message,), { "DESCRIPTOR": _RECOMMENDATIONRESPONSE, - "__module__": "recommendations_pb2" + "__module__": "recommendations_pb2", # @@protoc_insertion_point(class_scope:RecommendationResponse) }, ) diff --git a/python-microservices-with-grpc/recommendations/recommendations.py b/python-microservices-with-grpc/recommendations/recommendations.py index a40b69ce68..6191e193c2 100644 --- a/python-microservices-with-grpc/recommendations/recommendations.py +++ b/python-microservices-with-grpc/recommendations/recommendations.py @@ -1,16 +1,15 @@ -from concurrent import futures import random +from concurrent import futures import grpc +import recommendations_pb2_grpc from grpc_interceptor import ExceptionToStatusInterceptor from grpc_interceptor.exceptions import NotFound - from recommendations_pb2 import ( BookCategory, BookRecommendation, RecommendationResponse, ) -import recommendations_pb2_grpc books_by_category = { BookCategory.MYSTERY: [ diff --git a/python-microservices-with-grpc/recommendations/recommendations_pb2.py b/python-microservices-with-grpc/recommendations/recommendations_pb2.py index 79e366b1d0..d22b890fbe 100644 --- a/python-microservices-with-grpc/recommendations/recommendations_pb2.py +++ b/python-microservices-with-grpc/recommendations/recommendations_pb2.py @@ -234,16 +234,16 @@ ) _RECOMMENDATIONREQUEST.fields_by_name["category"].enum_type = _BOOKCATEGORY -_RECOMMENDATIONRESPONSE.fields_by_name[ - "recommendations" -].message_type = _BOOKRECOMMENDATION -DESCRIPTOR.message_types_by_name[ - "RecommendationRequest" -] = _RECOMMENDATIONREQUEST +_RECOMMENDATIONRESPONSE.fields_by_name["recommendations"].message_type = ( + _BOOKRECOMMENDATION +) +DESCRIPTOR.message_types_by_name["RecommendationRequest"] = ( + _RECOMMENDATIONREQUEST +) DESCRIPTOR.message_types_by_name["BookRecommendation"] = _BOOKRECOMMENDATION -DESCRIPTOR.message_types_by_name[ - "RecommendationResponse" -] = _RECOMMENDATIONRESPONSE +DESCRIPTOR.message_types_by_name["RecommendationResponse"] = ( + _RECOMMENDATIONRESPONSE +) DESCRIPTOR.enum_types_by_name["BookCategory"] = _BOOKCATEGORY _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -252,7 +252,7 @@ (_message.Message,), { "DESCRIPTOR": _RECOMMENDATIONREQUEST, - "__module__": "recommendations_pb2" + "__module__": "recommendations_pb2", # @@protoc_insertion_point(class_scope:RecommendationRequest) }, ) @@ -263,7 +263,7 @@ (_message.Message,), { "DESCRIPTOR": _BOOKRECOMMENDATION, - "__module__": "recommendations_pb2" + "__module__": "recommendations_pb2", # @@protoc_insertion_point(class_scope:BookRecommendation) }, ) @@ -274,7 +274,7 @@ (_message.Message,), { "DESCRIPTOR": _RECOMMENDATIONRESPONSE, - "__module__": "recommendations_pb2" + "__module__": "recommendations_pb2", # @@protoc_insertion_point(class_scope:RecommendationResponse) }, ) diff --git a/python-microservices-with-grpc/recommendations/recommendations_test.py b/python-microservices-with-grpc/recommendations/recommendations_test.py index c7a3051a40..9e15df91a1 100644 --- a/python-microservices-with-grpc/recommendations/recommendations_test.py +++ b/python-microservices-with-grpc/recommendations/recommendations_test.py @@ -1,5 +1,4 @@ from recommendations import RecommendationService - from recommendations_pb2 import BookCategory, RecommendationRequest diff --git a/python-multiple-exceptions/error_codes.py b/python-multiple-exceptions/error_codes.py index cdd8187e3d..2d15e52adc 100644 --- a/python-multiple-exceptions/error_codes.py +++ b/python-multiple-exceptions/error_codes.py @@ -1,5 +1,5 @@ -import os import errno +import os from pprint import pprint pprint({e: os.strerror(e) for e in sorted(errno.errorcode)}) diff --git a/python-parallel-processing/07_image_processing/image_processing.py b/python-parallel-processing/07_image_processing/image_processing.py index 6875634c9b..dba90890a8 100644 --- a/python-parallel-processing/07_image_processing/image_processing.py +++ b/python-parallel-processing/07_image_processing/image_processing.py @@ -7,11 +7,10 @@ import tkinter.ttk as ttk import numpy as np +import parallel import PIL.Image import PIL.ImageTk -import parallel - class AppWindow(tk.Tk): def __init__(self, image: PIL.Image.Image) -> None: diff --git a/python-parallel-processing/07_image_processing/image_processing_bonus.py b/python-parallel-processing/07_image_processing/image_processing_bonus.py index 32b69b7013..a76f2b0d75 100644 --- a/python-parallel-processing/07_image_processing/image_processing_bonus.py +++ b/python-parallel-processing/07_image_processing/image_processing_bonus.py @@ -8,11 +8,10 @@ import tkinter.ttk as ttk import numpy as np +import parallel import PIL.Image import PIL.ImageTk -import parallel - class ProcessingMode(enum.StrEnum): PYTHON = "Python" diff --git a/python-polars/downloads.py b/python-polars/downloads.py index 91facd334c..d7558cb347 100644 --- a/python-polars/downloads.py +++ b/python-polars/downloads.py @@ -1,4 +1,5 @@ import pathlib + import requests diff --git a/python-polars/scanning_data.py b/python-polars/scanning_data.py index c967e06b86..29973317a0 100644 --- a/python-polars/scanning_data.py +++ b/python-polars/scanning_data.py @@ -1,4 +1,5 @@ import pathlib + import polars as pl from downloads import download_file diff --git a/python-qr-code/scripts/animated_qrcode.py b/python-qr-code/scripts/animated_qrcode.py index d64acb6ba2..b8819a6847 100644 --- a/python-qr-code/scripts/animated_qrcode.py +++ b/python-qr-code/scripts/animated_qrcode.py @@ -1,6 +1,7 @@ -import segno from urllib.request import urlopen +import segno + slts_qrcode = segno.make_qr("https://www.youtube.com/watch?v=hTWKbfoikeg") nirvana_url = urlopen("https://media.giphy.com/media/LpwBqCorPvZC0/giphy.gif") slts_qrcode.to_artistic( diff --git a/python-quiz-application/source_code_final/quiz.py b/python-quiz-application/source_code_final/quiz.py index 78724804d3..74dffe9b81 100644 --- a/python-quiz-application/source_code_final/quiz.py +++ b/python-quiz-application/source_code_final/quiz.py @@ -94,7 +94,7 @@ def get_answers(question, alternatives, num_choices=1, hint=None): for answer in answers ): print( - f"{invalid!r} is not a valid choice. " # noqa + f"{invalid!r} is not a valid choice. " f"Please use {', '.join(labeled_alternatives)}" ) continue diff --git a/python-quiz-application/source_code_step_5/quiz.py b/python-quiz-application/source_code_step_5/quiz.py index 470808aa4f..8628991b88 100644 --- a/python-quiz-application/source_code_step_5/quiz.py +++ b/python-quiz-application/source_code_step_5/quiz.py @@ -85,7 +85,7 @@ def get_answers(question, alternatives, num_choices=1, hint=None): for answer in answers ): print( - f"{invalid!r} is not a valid choice. " # noqa + f"{invalid!r} is not a valid choice. " f"Please use {', '.join(labeled_alternatives)}" ) continue diff --git a/python-requests/persist_info_with_session.py b/python-requests/persist_info_with_session.py index d1df9bdc3d..d2a18bba30 100644 --- a/python-requests/persist_info_with_session.py +++ b/python-requests/persist_info_with_session.py @@ -1,5 +1,4 @@ import requests - from custom_token_auth import TokenAuth TOKEN = "" diff --git a/python-scipy-cluster-optimize/cluster_sms_spam.py b/python-scipy-cluster-optimize/cluster_sms_spam.py index 97dddee8d7..8b63de2538 100644 --- a/python-scipy-cluster-optimize/cluster_sms_spam.py +++ b/python-scipy-cluster-optimize/cluster_sms_spam.py @@ -5,9 +5,11 @@ Scientific Python: Using SciPy for Optimization Available at: https://realpython.com/python-scipy-cluster-optimize/ """ + from pathlib import Path + import numpy as np -from scipy.cluster.vq import whiten, kmeans, vq +from scipy.cluster.vq import kmeans, vq, whiten HERE = Path(__file__).parent diff --git a/python-scipy-cluster-optimize/minimize_constrained.py b/python-scipy-cluster-optimize/minimize_constrained.py index b810fc5138..c3c5a119bf 100644 --- a/python-scipy-cluster-optimize/minimize_constrained.py +++ b/python-scipy-cluster-optimize/minimize_constrained.py @@ -5,8 +5,9 @@ Scientific Python: Using SciPy for Optimization Available at: https://realpython.com/python-scipy-cluster-optimize/ """ + import numpy as np -from scipy.optimize import minimize, LinearConstraint +from scipy.optimize import LinearConstraint, minimize n_buyers = 10 n_shares = 15 diff --git a/python-scipy-cluster-optimize/minimize_scalar.py b/python-scipy-cluster-optimize/minimize_scalar.py index 57fc26f4f9..56a02a3e38 100644 --- a/python-scipy-cluster-optimize/minimize_scalar.py +++ b/python-scipy-cluster-optimize/minimize_scalar.py @@ -5,6 +5,7 @@ Scientific Python: Using SciPy for Optimization Available at: https://realpython.com/python-scipy-cluster-optimize/ """ + from scipy.optimize import minimize_scalar diff --git a/python-self-type/accounts.py b/python-self-type/accounts.py index 86359bb514..97d7c070ee 100644 --- a/python-self-type/accounts.py +++ b/python-self-type/accounts.py @@ -1,6 +1,6 @@ +import random from dataclasses import dataclass from typing import Self -import random @dataclass diff --git a/python-self-type/accounts_future_module.py b/python-self-type/accounts_future_module.py index e087d08e0c..9ab6136af0 100644 --- a/python-self-type/accounts_future_module.py +++ b/python-self-type/accounts_future_module.py @@ -1,6 +1,7 @@ from __future__ import annotations -from dataclasses import dataclass + import random +from dataclasses import dataclass @dataclass diff --git a/python-self-type/accounts_typevar.py b/python-self-type/accounts_typevar.py index 0d1c4ac6ad..2fa862aa36 100644 --- a/python-self-type/accounts_typevar.py +++ b/python-self-type/accounts_typevar.py @@ -1,6 +1,6 @@ +import random from dataclasses import dataclass from typing import TypeVar -import random # Create TBankAccount type bound by the BankAccount class TBankAccount = TypeVar("TBankAccount", bound="BankAccount") diff --git a/python-self-type/stack_future_module.py b/python-self-type/stack_future_module.py index 9efc94b9fa..e82cf98328 100644 --- a/python-self-type/stack_future_module.py +++ b/python-self-type/stack_future_module.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Any diff --git a/python-serialize/executable-code/code-objects/dill_demo.py b/python-serialize/executable-code/code-objects/dill_demo.py index 37ec689401..07ec12deb3 100644 --- a/python-serialize/executable-code/code-objects/dill_demo.py +++ b/python-serialize/executable-code/code-objects/dill_demo.py @@ -4,7 +4,7 @@ def main(): create_plus = deserialize(serialize()) print(create_plus) - print(f"{create_plus(3)(2) = }") # noqa + print(f"{create_plus(3)(2) = }") def serialize(): diff --git a/python-serialize/executable-code/digital-signature/main.py b/python-serialize/executable-code/digital-signature/main.py index 9078949112..aee1d5bdf9 100644 --- a/python-serialize/executable-code/digital-signature/main.py +++ b/python-serialize/executable-code/digital-signature/main.py @@ -9,7 +9,7 @@ def main(): serialize(lambda a, b: a + b, path, b"top-secret") code = deserialize(path, b"top-secret") print(code) - print(f"{code(3, 2) = }") # noqa + print(f"{code(3, 2) = }") try: deserialize(path, b"incorrect-key") except pickle.UnpicklingError as ex: diff --git a/python-serialize/executable-code/pickle-importable/main.py b/python-serialize/executable-code/pickle-importable/main.py index 9bf1cd5551..342f314663 100644 --- a/python-serialize/executable-code/pickle-importable/main.py +++ b/python-serialize/executable-code/pickle-importable/main.py @@ -8,7 +8,7 @@ def main(): function = pickle.loads(function_raw) print(function_raw) print(function) - print(f"{function(3)(2) = }") # noqa + print(f"{function(3)(2) = }") if __name__ == "__main__": diff --git a/python-serialize/http-payload/django-rest-api/project/urls.py b/python-serialize/http-payload/django-rest-api/project/urls.py index b4217eef6a..c1d25f85e4 100644 --- a/python-serialize/http-payload/django-rest-api/project/urls.py +++ b/python-serialize/http-payload/django-rest-api/project/urls.py @@ -14,6 +14,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import include, path diff --git a/python-serialize/tabular-data/parquet-demo/main.py b/python-serialize/tabular-data/parquet-demo/main.py index 757d4459cd..f5438fe9f3 100644 --- a/python-serialize/tabular-data/parquet-demo/main.py +++ b/python-serialize/tabular-data/parquet-demo/main.py @@ -11,8 +11,8 @@ def main(): df2 = deserialize_with_pyarrow("users.parquet") df3 = deserialize_with_fastparquet("users.parquet") - print(f"{df1.equals(df2) = }") # noqa - print(f"{df2.equals(df3) = }") # noqa + print(f"{df1.equals(df2) = }") + print(f"{df2.equals(df3) = }") df = prune_and_filter("users.parquet") print(df.head()) diff --git a/python-sockets-tutorial/app-client.py b/python-sockets-tutorial/app-client.py index 40aa3d53a3..2705e5c1d6 100755 --- a/python-sockets-tutorial/app-client.py +++ b/python-sockets-tutorial/app-client.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -import sys -import socket import selectors +import socket +import sys import traceback import libclient diff --git a/python-sockets-tutorial/app-server.py b/python-sockets-tutorial/app-server.py index 7f4e2d16ef..a4292c5f45 100755 --- a/python-sockets-tutorial/app-server.py +++ b/python-sockets-tutorial/app-server.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -import sys -import socket import selectors +import socket +import sys import traceback import libserver diff --git a/python-sockets-tutorial/libclient.py b/python-sockets-tutorial/libclient.py index 73be7a1a04..ce1c4662b9 100644 --- a/python-sockets-tutorial/libclient.py +++ b/python-sockets-tutorial/libclient.py @@ -1,8 +1,8 @@ -import sys -import selectors -import json import io +import json +import selectors import struct +import sys class Message: diff --git a/python-sockets-tutorial/libserver.py b/python-sockets-tutorial/libserver.py index 145199d675..7aa6c4485f 100644 --- a/python-sockets-tutorial/libserver.py +++ b/python-sockets-tutorial/libserver.py @@ -1,8 +1,8 @@ -import sys -import selectors -import json import io +import json +import selectors import struct +import sys request_search = { "morpheus": "Follow the white rabbit. \U0001f430", diff --git a/python-sockets-tutorial/multiconn-client.py b/python-sockets-tutorial/multiconn-client.py index 4e75ca1ce8..a5b33dc3c3 100755 --- a/python-sockets-tutorial/multiconn-client.py +++ b/python-sockets-tutorial/multiconn-client.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -import sys -import socket import selectors +import socket +import sys import types sel = selectors.DefaultSelector() diff --git a/python-sockets-tutorial/multiconn-server.py b/python-sockets-tutorial/multiconn-server.py index 411794c9e0..ea2abcb68a 100755 --- a/python-sockets-tutorial/multiconn-server.py +++ b/python-sockets-tutorial/multiconn-server.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -import sys -import socket import selectors +import socket +import sys import types sel = selectors.DefaultSelector() diff --git a/python-split-list/parallel_demo.py b/python-split-list/parallel_demo.py index c53bf261df..69144d88e1 100644 --- a/python-split-list/parallel_demo.py +++ b/python-split-list/parallel_demo.py @@ -15,7 +15,6 @@ import numpy as np from PIL import Image - from spatial_splitting import Bounds, split_multi IMAGE_WIDTH, IMAGE_HEIGHT = 1920, 1080 diff --git a/python-sqlite-sqlalchemy/project/build_data/build_author_book_publisher_sqlite.py b/python-sqlite-sqlalchemy/project/build_data/build_author_book_publisher_sqlite.py index 4b5629e466..09ce0a79f3 100644 --- a/python-sqlite-sqlalchemy/project/build_data/build_author_book_publisher_sqlite.py +++ b/python-sqlite-sqlalchemy/project/build_data/build_author_book_publisher_sqlite.py @@ -3,15 +3,14 @@ author_book_publisher.csv file. """ -import os import csv +import os from importlib import resources + from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker -from project.modules.models import Base -from project.modules.models import Author -from project.modules.models import Book -from project.modules.models import Publisher + +from project.modules.models import Author, Base, Book, Publisher def get_author_book_publisher_data(filepath): diff --git a/python-sqlite-sqlalchemy/project/examples/example_2/main.py b/python-sqlite-sqlalchemy/project/examples/example_2/main.py index 666be8b69a..3adc03ae6c 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_2/main.py +++ b/python-sqlite-sqlalchemy/project/examples/example_2/main.py @@ -5,11 +5,10 @@ from importlib import resources +from project.modules.models import Author, Book, Publisher from sqlalchemy import and_, create_engine from sqlalchemy.orm import sessionmaker from sqlalchemy.sql import asc, desc, func - -from project.modules.models import Author, Book, Publisher from treelib import Tree diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/__init__.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/__init__.py index ba9a85095f..a523870720 100755 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/__init__.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/__init__.py @@ -1,8 +1,7 @@ -from flask import Flask -from flask import render_template +from config import Config +from flask import Flask, render_template from flask_bootstrap import Bootstrap from flask_sqlalchemy import SQLAlchemy -from config import Config # Define the application app = Flask(__name__, instance_relative_config=False) @@ -17,13 +16,13 @@ Bootstrap(app) # Register Blueprings -from .artists import routes as artist_routes # noqa: E402 from .albums import routes as album_routes # noqa: E402 -from .tracks import routes as track_routes # noqa: E402 -from .playlists import routes as playlist_routes # noqa: E402 +from .artists import routes as artist_routes # noqa: E402 from .customers import routes as customer_routes # noqa: E402 -from .invoices import routes as invoice_routes # noqa: E402 from .employees import routes as employee_routes # noqa: E402 +from .invoices import routes as invoice_routes # noqa: E402 +from .playlists import routes as playlist_routes # noqa: E402 +from .tracks import routes as track_routes # noqa: E402 app.register_blueprint(artist_routes.artists_bp) app.register_blueprint(album_routes.albums_bp) diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/albums/routes.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/albums/routes.py index 94533b4d14..035710f2d5 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/albums/routes.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/albums/routes.py @@ -1,11 +1,9 @@ -from flask import Blueprint, render_template, redirect, url_for +from app import db +from app.models import Album, Artist +from flask import Blueprint, redirect, render_template, url_for from flask_wtf import FlaskForm -from wtforms import StringField -from wtforms import HiddenField +from wtforms import HiddenField, StringField from wtforms.validators import InputRequired, ValidationError -from app import db -from app.models import Artist, Album - # Setup the Blueprint albums_bp = Blueprint( diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/artists/routes.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/artists/routes.py index 6d4b1854ee..13e1933905 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/artists/routes.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/artists/routes.py @@ -1,14 +1,9 @@ -from flask import Blueprint -from flask import render_template -from flask import redirect -from flask import url_for -from flask_wtf import FlaskForm -from wtforms import StringField -from wtforms.validators import InputRequired -from wtforms.validators import ValidationError from app import db from app.models import Artist - +from flask import Blueprint, redirect, render_template, url_for +from flask_wtf import FlaskForm +from wtforms import StringField +from wtforms.validators import InputRequired, ValidationError # Setup the Blueprint artists_bp = Blueprint( diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/customers/routes.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/customers/routes.py index 8877ad2296..577f6aac42 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/customers/routes.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/customers/routes.py @@ -1,11 +1,8 @@ -from flask import Blueprint -from flask import render_template -from sqlalchemy import func -from app import db -from app.models import Customer -from app.models import Invoice -from sqlalchemy import desc +from flask import Blueprint, render_template +from sqlalchemy import desc, func +from app import db +from app.models import Customer, Invoice # Setup the Blueprint customers_bp = Blueprint( diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/employees/routes.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/employees/routes.py index fd9e493a5e..96cf937a7b 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/employees/routes.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/employees/routes.py @@ -1,9 +1,8 @@ -from flask import Blueprint -from flask import render_template +from flask import Blueprint, render_template + from app import db from app.models import Employee - # Setup the Blueprint employees_bp = Blueprint( "employees_bp", diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/invoices/routes.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/invoices/routes.py index 9d3aa79a52..ddb0e4f0a8 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/invoices/routes.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/invoices/routes.py @@ -1,9 +1,8 @@ -from flask import Blueprint -from flask import render_template +from flask import Blueprint, render_template + from app import db from app.models import Invoice - # Setup the Blueprint invoices_bp = Blueprint( "invoices_bp", diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/models.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/models.py index 68c7967c41..adeca83b61 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/models.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/models.py @@ -1,8 +1,9 @@ # coding: utf-8 -from app import db from sqlalchemy.ext.hybrid import hybrid_property +from app import db + class Artist(db.Model): __tablename__ = "artists" diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/playlists/routes.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/playlists/routes.py index 32b2bd4ccf..e824df0941 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/playlists/routes.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/playlists/routes.py @@ -1,9 +1,8 @@ -from flask import Blueprint -from flask import render_template +from flask import Blueprint, render_template + from app import db from app.models import Playlist - # Setup the Blueprint playlists_bp = Blueprint( "playlists_bp", diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/app/tracks/routes.py b/python-sqlite-sqlalchemy/project/examples/example_3/app/tracks/routes.py index b159347a91..1d5a1e7de1 100644 --- a/python-sqlite-sqlalchemy/project/examples/example_3/app/tracks/routes.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/app/tracks/routes.py @@ -1,20 +1,15 @@ -from flask import Blueprint -from flask import render_template -from flask_wtf import FlaskForm -from wtforms import StringField -from wtforms import IntegerField -from wtforms import FloatField -from wtforms import SelectField -from wtforms import HiddenField -from wtforms.validators import InputRequired -from wtforms.validators import ValidationError from app import db -from app.models import Artist -from app.models import Album -from app.models import Track -from app.models import MediaType -from app.models import Genre - +from app.models import Album, Artist, Genre, MediaType, Track +from flask import Blueprint, render_template +from flask_wtf import FlaskForm +from wtforms import ( + FloatField, + HiddenField, + IntegerField, + SelectField, + StringField, +) +from wtforms.validators import InputRequired, ValidationError # Setup the Blueprint tracks_bp = Blueprint( diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/chinook_server.py b/python-sqlite-sqlalchemy/project/examples/example_3/chinook_server.py index f58cc8daaf..239d4c0858 100755 --- a/python-sqlite-sqlalchemy/project/examples/example_3/chinook_server.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/chinook_server.py @@ -1,5 +1,4 @@ from app import app - if __name__ == "__main__": app.run("0.0.0.0", port=5000) diff --git a/python-sqlite-sqlalchemy/project/examples/example_3/config.py b/python-sqlite-sqlalchemy/project/examples/example_3/config.py index ed9752edc9..71af048474 100755 --- a/python-sqlite-sqlalchemy/project/examples/example_3/config.py +++ b/python-sqlite-sqlalchemy/project/examples/example_3/config.py @@ -1,6 +1,7 @@ -import os import json +import os from pathlib import Path + from dotenv import load_dotenv # Load the environment variables from .env file diff --git a/python-sqlite-sqlalchemy/project/modules/models.py b/python-sqlite-sqlalchemy/project/modules/models.py index a0be20ea15..ece5afdeba 100644 --- a/python-sqlite-sqlalchemy/project/modules/models.py +++ b/python-sqlite-sqlalchemy/project/modules/models.py @@ -1,6 +1,6 @@ -from sqlalchemy import Column, Integer, String, ForeignKey, Table -from sqlalchemy.orm import relationship, backref +from sqlalchemy import Column, ForeignKey, Integer, String, Table from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import backref, relationship Base = declarative_base() diff --git a/python-sqlite-sqlalchemy/setup.py b/python-sqlite-sqlalchemy/setup.py index 6a78c1e2ab..23cb704b6d 100644 --- a/python-sqlite-sqlalchemy/setup.py +++ b/python-sqlite-sqlalchemy/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup( name="project", diff --git a/python-type-checking/hearts.py b/python-type-checking/hearts.py index b2c54f7a12..71579d5ca9 100644 --- a/python-type-checking/hearts.py +++ b/python-type-checking/hearts.py @@ -1,10 +1,9 @@ # hearts.py -from collections import Counter import random import sys -from typing import Any, Dict, List, Optional, Sequence, Tuple, Union -from typing import overload +from collections import Counter +from typing import Any, Dict, List, Optional, Sequence, Tuple, Union, overload class Card: @@ -67,16 +66,12 @@ def __len__(self) -> int: return len(self.cards) @overload - def __getitem__(self, key: int) -> Card: - ... + def __getitem__(self, key: int) -> Card: ... @overload - def __getitem__(self, key: slice) -> "Deck": # noqa - ... + def __getitem__(self, key: slice) -> "Deck": ... - def __getitem__( # noqa - self, key: Union[int, slice] - ) -> Union[Card, "Deck"]: + def __getitem__(self, key: Union[int, slice]) -> Union[Card, "Deck"]: if isinstance(key, int): return self.cards[key] elif isinstance(key, slice): diff --git a/python-type-checking/parse.pyi b/python-type-checking/parse.pyi index 357354aa24..3a252f6eb7 100644 --- a/python-type-checking/parse.pyi +++ b/python-type-checking/parse.pyi @@ -1,6 +1,6 @@ # parse.pyi -from typing import Any, Mapping, Optional, Sequence, Tuple, Union +from typing import Mapping, Optional, Sequence, Tuple, Union class Result: def __init__( diff --git a/python-type-hints-multiple-types/06_type_aliases.py b/python-type-hints-multiple-types/06_type_aliases.py index 880fdd8cbb..1a16c2fd5c 100644 --- a/python-type-hints-multiple-types/06_type_aliases.py +++ b/python-type-hints-multiple-types/06_type_aliases.py @@ -1,6 +1,5 @@ from typing import TypeAlias - EmailComponents: TypeAlias = tuple[str, str] | None diff --git a/python-wav-files/plot_oscilloscope.py b/python-wav-files/plot_oscilloscope.py index 2b05a22252..48fa28bfc4 100644 --- a/python-wav-files/plot_oscilloscope.py +++ b/python-wav-files/plot_oscilloscope.py @@ -3,7 +3,6 @@ import matplotlib.pyplot as plt import numpy as np - from waveio import WAVReader diff --git a/python-wav-files/plot_spectrogram.py b/python-wav-files/plot_spectrogram.py index c814458cf0..5a8e820507 100644 --- a/python-wav-files/plot_spectrogram.py +++ b/python-wav-files/plot_spectrogram.py @@ -3,7 +3,6 @@ import matplotlib.pyplot as plt import numpy as np - from waveio import WAVReader diff --git a/python-wav-files/plot_waveform.py b/python-wav-files/plot_waveform.py index 579f4a4667..7900ee9328 100644 --- a/python-wav-files/plot_waveform.py +++ b/python-wav-files/plot_waveform.py @@ -4,7 +4,6 @@ import matplotlib.pyplot as plt import numpy as np from matplotlib.ticker import FuncFormatter - from waveio import WAVReader diff --git a/python-wav-files/stream.py b/python-wav-files/stream.py index c9fb8063ba..ecea9075b7 100644 --- a/python-wav-files/stream.py +++ b/python-wav-files/stream.py @@ -1,5 +1,4 @@ import av - from waveio.encoding import PCMEncoding from waveio.metadata import WAVMetadata diff --git a/python-web-applications/main.py b/python-web-applications/main.py index e0089a5623..0a941f62b3 100644 --- a/python-web-applications/main.py +++ b/python-web-applications/main.py @@ -1,5 +1,4 @@ -from flask import Flask -from flask import request +from flask import Flask, request app = Flask(__name__) diff --git a/python-yaml/formatter/server.py b/python-yaml/formatter/server.py index 64c3221de0..9eefe67c8e 100644 --- a/python-yaml/formatter/server.py +++ b/python-yaml/formatter/server.py @@ -10,7 +10,7 @@ import yaml from fastapi import FastAPI -from fastapi.responses import JSONResponse, HTMLResponse +from fastapi.responses import HTMLResponse, JSONResponse from fastapi.staticfiles import StaticFiles from pydantic import BaseModel diff --git a/python-yaml/tree.py b/python-yaml/tree.py index 5f21fdaa1b..6743d5b757 100644 --- a/python-yaml/tree.py +++ b/python-yaml/tree.py @@ -54,14 +54,16 @@ def html_list(node): def html_map(node): pairs = "".join( - f'
  • {visit(key)}: {visit(value)}
    • ' - if isinstance(value, yaml.ScalarNode) - else ( - "
  • " - "
    " - f'{visit(key)} {visit(value)}' - "
    " - "
    • " + ( + f'
  • {visit(key)}: {visit(value)}
    • ' + if isinstance(value, yaml.ScalarNode) + else ( + "
  • " + "
    " + f'{visit(key)} {visit(value)}' + "
    " + "
    • " + ) ) for key, value in node.value ) diff --git a/python-yaml/yaml2html.py b/python-yaml/yaml2html.py index 3efc09a0c1..725bf38031 100644 --- a/python-yaml/yaml2html.py +++ b/python-yaml/yaml2html.py @@ -4,11 +4,11 @@ import yaml from yaml import ( + MappingEndEvent, + MappingStartEvent, ScalarEvent, - SequenceStartEvent, SequenceEndEvent, - MappingStartEvent, - MappingEndEvent, + SequenceStartEvent, ) OPEN_TAG_EVENTS = (ScalarEvent, SequenceStartEvent, MappingStartEvent) diff --git a/qt-designer-python/sample_editor/app.py b/qt-designer-python/sample_editor/app.py index 79edb0647a..f37347e8e5 100644 --- a/qt-designer-python/sample_editor/app.py +++ b/qt-designer-python/sample_editor/app.py @@ -1,10 +1,9 @@ import sys +from main_window_ui import Ui_MainWindow from PyQt5.QtWidgets import QApplication, QDialog, QMainWindow, QMessageBox from PyQt5.uic import loadUi -from main_window_ui import Ui_MainWindow - class Window(QMainWindow, Ui_MainWindow): def __init__(self, parent=None): diff --git a/queue/src/graph.py b/queue/src/graph.py index ee87f7f76e..dbdcb94091 100644 --- a/queue/src/graph.py +++ b/queue/src/graph.py @@ -5,7 +5,6 @@ from typing import NamedTuple import networkx as nx - from queues import MutableMinHeap, Queue, Stack diff --git a/replace-string-python/bad_json.py b/replace-string-python/bad_json.py index 7e78e384f6..d297f4865f 100644 --- a/replace-string-python/bad_json.py +++ b/replace-string-python/bad_json.py @@ -1,5 +1,5 @@ -import re import json +import re data = """{ birthday = 1991 diff --git a/replace-string-python/bad_json_callback.py b/replace-string-python/bad_json_callback.py index 5cf7b3b419..e09c706655 100644 --- a/replace-string-python/bad_json_callback.py +++ b/replace-string-python/bad_json_callback.py @@ -1,5 +1,5 @@ -import re import json +import re data = """{ birthday = 1991 diff --git a/replace-string-python/transcript_reduce.py b/replace-string-python/transcript_reduce.py index d42d264e18..70d13ee120 100644 --- a/replace-string-python/transcript_reduce.py +++ b/replace-string-python/transcript_reduce.py @@ -1,6 +1,5 @@ from functools import reduce - REPLACEMENTS = [ ("BLASTED", "😤"), ("Blast", "😤"), diff --git a/replace-string-python/transcript_regex_callback.py b/replace-string-python/transcript_regex_callback.py index 6888d62030..70a2bd3935 100644 --- a/replace-string-python/transcript_regex_callback.py +++ b/replace-string-python/transcript_regex_callback.py @@ -1,6 +1,5 @@ import re - ENTRY_PATTERN = ( r"\[(.+)\] " # User string, discarding square brackets r"[-T:+\d]{25} " # Time stamp diff --git a/requirements.txt b/requirements.txt index ed52968a38..a79f21d56d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -black[jupyter]==22.6.0 -flake8==6.1.0 +black[jupyter]==24.4.2 +ruff==0.4.2 diff --git a/rp-portfolio/pages/urls.py b/rp-portfolio/pages/urls.py index 56268a2247..f3d3c3f3ac 100644 --- a/rp-portfolio/pages/urls.py +++ b/rp-portfolio/pages/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from pages import views urlpatterns = [ diff --git a/rp-portfolio/personal_portfolio/urls.py b/rp-portfolio/personal_portfolio/urls.py index 6fd49c525f..0393e34a6f 100644 --- a/rp-portfolio/personal_portfolio/urls.py +++ b/rp-portfolio/personal_portfolio/urls.py @@ -1,7 +1,7 @@ -from django.contrib import admin -from django.urls import path, include from django.conf import settings from django.conf.urls.static import static +from django.contrib import admin +from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), diff --git a/rp-portfolio/projects/admin.py b/rp-portfolio/projects/admin.py index 0afa67bf68..00bf114fc7 100644 --- a/rp-portfolio/projects/admin.py +++ b/rp-portfolio/projects/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from projects.models import Project diff --git a/rp-portfolio/projects/urls.py b/rp-portfolio/projects/urls.py index 3bce1cbefb..387535f165 100644 --- a/rp-portfolio/projects/urls.py +++ b/rp-portfolio/projects/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from projects import views urlpatterns = [ diff --git a/rp-portfolio/projects/views.py b/rp-portfolio/projects/views.py index eb05a040b7..7bd8cae49c 100644 --- a/rp-portfolio/projects/views.py +++ b/rp-portfolio/projects/views.py @@ -1,4 +1,5 @@ from django.shortcuts import render + from projects.models import Project diff --git a/serverless-sms-service/app.py b/serverless-sms-service/app.py index a9bd1cce8f..cb0c361bb6 100644 --- a/serverless-sms-service/app.py +++ b/serverless-sms-service/app.py @@ -1,9 +1,9 @@ # core imports from chalice import Chalice, Response -from twilio.base.exceptions import TwilioRestException # app level imports from chalicelib import sms +from twilio.base.exceptions import TwilioRestException app = Chalice(app_name="sms-shooter") diff --git a/serverless-sms-service/chalicelib/sms.py b/serverless-sms-service/chalicelib/sms.py index 49cac1e803..111c3fcbb2 100644 --- a/serverless-sms-service/chalicelib/sms.py +++ b/serverless-sms-service/chalicelib/sms.py @@ -1,4 +1,5 @@ from os import environ as env + from twilio.rest import Client # Twilio Config diff --git a/simulation-with-simpy/simulate.py b/simulation-with-simpy/simulate.py index 5ac89e20fc..3a726775eb 100644 --- a/simulation-with-simpy/simulate.py +++ b/simulation-with-simpy/simulate.py @@ -6,10 +6,11 @@ SimPy version: 3.0.11 """ -import simpy import random import statistics +import simpy + wait_times = [] diff --git a/sort-python-dictionary/compare_sorting_dict_vs_list.py b/sort-python-dictionary/compare_sorting_dict_vs_list.py index 22a24551cc..b95eae22d4 100644 --- a/sort-python-dictionary/compare_sorting_dict_vs_list.py +++ b/sort-python-dictionary/compare_sorting_dict_vs_list.py @@ -24,5 +24,5 @@ f"""\ {sorting_list_time=:.2f} seconds {sorting_dict_time=:.2f} seconds -list is {(sorting_dict_time/sorting_list_time):.2f} times faster""" +list is {(sorting_dict_time / sorting_list_time):.2f} times faster""" ) diff --git a/storing-images/storing_images.ipynb b/storing-images/storing_images.ipynb index 482d929f00..416190a233 100644 --- a/storing-images/storing_images.ipynb +++ b/storing-images/storing_images.ipynb @@ -35,6 +35,7 @@ "# Path to the unzipped CIFAR data\n", "data_dir = Path(\"data/cifar-10-batches-py/\")\n", "\n", + "\n", "# Unpickle function provided by the CIFAR hosts\n", "def unpickle(file):\n", " with open(file, \"rb\") as fo:\n", diff --git a/storing-images/storing_images.py b/storing-images/storing_images.py index 9530ec42b1..38d7459ee7 100644 --- a/storing-images/storing_images.py +++ b/storing-images/storing_images.py @@ -11,22 +11,21 @@ """ -import matplotlib.pyplot as plt -import numpy as np +import csv +import pickle from pathlib import Path from timeit import timeit -# For disk -from PIL import Image -import csv +# For HDF5 +import h5py # For lmdb import lmdb -import pickle - -# For HDF5 -import h5py +import matplotlib.pyplot as plt +import numpy as np +# For disk +from PIL import Image # Path to the unzipped CIFAR data data_dir = Path("data/cifar-10-batches-py/") diff --git a/subprocess/create_project.py b/subprocess/create_project.py index e77f6b60a1..1149de5efd 100644 --- a/subprocess/create_project.py +++ b/subprocess/create_project.py @@ -7,9 +7,9 @@ If your Python command is `python3`, change the `PYTHON_COMMAND` variable. """ +import subprocess from argparse import ArgumentParser from pathlib import Path -import subprocess PYTHON_COMMAND = "python" diff --git a/subprocess/error_handling.py b/subprocess/error_handling.py index 68dcc86a98..733d1ae6a1 100644 --- a/subprocess/error_handling.py +++ b/subprocess/error_handling.py @@ -6,7 +6,6 @@ import subprocess - try: subprocess.run(["python", "timer.py", "10"], timeout=5, check=True) except FileNotFoundError as exc: diff --git a/subprocess/random_num_gen_check_output.py b/subprocess/random_num_gen_check_output.py index 5f4ab7ec82..15aff7b796 100644 --- a/subprocess/random_num_gen_check_output.py +++ b/subprocess/random_num_gen_check_output.py @@ -3,7 +3,6 @@ generate a random number, read the output, and then print it. """ - import subprocess process = subprocess.run( diff --git a/subprocess/reaction_game.py b/subprocess/reaction_game.py index 16a908fa72..c61fe1863a 100644 --- a/subprocess/reaction_game.py +++ b/subprocess/reaction_game.py @@ -5,8 +5,8 @@ to press enter. """ -from time import perf_counter, sleep from random import random +from time import perf_counter, sleep print("Press enter to play") input() diff --git a/tic-tac-toe-ai-python/source_code_bonus/tic-tac-toe/frontends/browser/script.py b/tic-tac-toe-ai-python/source_code_bonus/tic-tac-toe/frontends/browser/script.py index d5545ffb9b..6855c60198 100644 --- a/tic-tac-toe-ai-python/source_code_bonus/tic-tac-toe/frontends/browser/script.py +++ b/tic-tac-toe-ai-python/source_code_bonus/tic-tac-toe/frontends/browser/script.py @@ -1,11 +1,9 @@ from asyncio.queues import Queue from js import document -from pyodide import create_proxy - from players import BrowserPlayer +from pyodide import create_proxy from renderers import BrowserRenderer - from tic_tac_toe.game.engine_async import AsyncTicTacToe from tic_tac_toe.game.players_async import ( AsyncMinimaxComputerPlayer, diff --git a/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/console/args.py b/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/console/args.py index 0e2f683383..20b79f9a9d 100644 --- a/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/console/args.py +++ b/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/console/args.py @@ -2,9 +2,9 @@ from typing import NamedTuple from tic_tac_toe.game.players import ( + MinimaxComputerPlayer, Player, RandomComputerPlayer, - MinimaxComputerPlayer, ) from tic_tac_toe.logic.models import Mark diff --git a/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/play.py b/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/play.py index aefb5c9411..aea2dbe105 100644 --- a/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/play.py +++ b/tic-tac-toe-ai-python/source_code_final/tic-tac-toe/frontends/play.py @@ -1,10 +1,9 @@ +from console.players import ConsolePlayer +from console.renderers import ConsoleRenderer from tic_tac_toe.game.engine import TicTacToe from tic_tac_toe.game.players import RandomComputerPlayer from tic_tac_toe.logic.models import Mark -from console.players import ConsolePlayer -from console.renderers import ConsoleRenderer - player1 = ConsolePlayer(Mark("X")) player2 = RandomComputerPlayer(Mark("O")) diff --git a/tic-tac-toe-ai-python/source_code_step_3/tic-tac-toe/frontends/play.py b/tic-tac-toe-ai-python/source_code_step_3/tic-tac-toe/frontends/play.py index aefb5c9411..aea2dbe105 100644 --- a/tic-tac-toe-ai-python/source_code_step_3/tic-tac-toe/frontends/play.py +++ b/tic-tac-toe-ai-python/source_code_step_3/tic-tac-toe/frontends/play.py @@ -1,10 +1,9 @@ +from console.players import ConsolePlayer +from console.renderers import ConsoleRenderer from tic_tac_toe.game.engine import TicTacToe from tic_tac_toe.game.players import RandomComputerPlayer from tic_tac_toe.logic.models import Mark -from console.players import ConsolePlayer -from console.renderers import ConsoleRenderer - player1 = ConsolePlayer(Mark("X")) player2 = RandomComputerPlayer(Mark("O")) diff --git a/top-python-game-engines/adventurelib/adventurelib_game.py b/top-python-game-engines/adventurelib/adventurelib_game.py index c0ed0f6800..1bb8a013db 100644 --- a/top-python-game-engines/adventurelib/adventurelib_game.py +++ b/top-python-game-engines/adventurelib/adventurelib_game.py @@ -11,18 +11,17 @@ # Import the library contents # from adventurelib import * -import adventurelib as adv - -# Import your rooms, which imports your items and characters -import adventurelib_game_rooms - -import adventurelib_game_items +# To allow you to exit the game +import sys # For your battle sequence from random import randint -# To allow you to exit the game -import sys +import adventurelib as adv +import adventurelib_game_items + +# Import your rooms, which imports your items and characters +import adventurelib_game_rooms # Set the first room current_room = adventurelib_game_rooms.home diff --git a/top-python-game-engines/adventurelib/adventurelib_game_rooms.py b/top-python-game-engines/adventurelib/adventurelib_game_rooms.py index c9ab8062ef..dddab2c9d6 100644 --- a/top-python-game-engines/adventurelib/adventurelib_game_rooms.py +++ b/top-python-game-engines/adventurelib/adventurelib_game_rooms.py @@ -5,12 +5,12 @@ # Import the library contents import adventurelib as adv -# Import your items as well -import adventurelib_game_items - # And your characters import adventurelib_game_characters +# Import your items as well +import adventurelib_game_items + # Create a subclass of Rooms to track some custom properties class GameArea(adv.Room): diff --git a/top-python-game-engines/arcade/arcade_game.py b/top-python-game-engines/arcade/arcade_game.py index 99c5d2f72e..61975b349f 100644 --- a/top-python-game-engines/arcade/arcade_game.py +++ b/top-python-game-engines/arcade/arcade_game.py @@ -9,13 +9,13 @@ """ # Import arcade allows the program to run in Python IDLE -import arcade +# To locate your assets +from pathlib import Path # To randomize coin placement from random import randint -# To locate your assets -from pathlib import Path +import arcade # Set the width and height of your game window, in pixels WIDTH = 800 diff --git a/top-python-game-engines/pygame/pygame_game.py b/top-python-game-engines/pygame/pygame_game.py index f84eef0c57..29d0a4d000 100644 --- a/top-python-game-engines/pygame/pygame_game.py +++ b/top-python-game-engines/pygame/pygame_game.py @@ -9,17 +9,17 @@ """ # Import and initialize the pygame library -import pygame +# To find your assets +from pathlib import Path # To randomize coin placement from random import randint -# To find your assets -from pathlib import Path - # For type hinting from typing import Tuple +import pygame + # Set the width and height of the output window, in pixels WIDTH = 800 HEIGHT = 600 diff --git a/top-python-game-engines/pygame_zero/pygame_zero_game.py b/top-python-game-engines/pygame_zero/pygame_zero_game.py index 3fc6dbb0df..c100f29af7 100644 --- a/top-python-game-engines/pygame_zero/pygame_zero_game.py +++ b/top-python-game-engines/pygame_zero/pygame_zero_game.py @@ -12,13 +12,13 @@ # Import pgzrun allows the program to run in Python IDLE # You can also run the program from the command line using: # `pgzrun pygame_zero_basic.py` -import pgzrun +# To randomize coin placement +from random import randint # For type-hinting support from typing import Tuple -# To randomize coin placement -from random import randint +import pgzrun # Set the width and height of your output window, in pixels WIDTH = 800 diff --git a/typer-cli-python/source_code_final/rptodo/__main__.py b/typer-cli-python/source_code_final/rptodo/__main__.py index 57c45b04a2..0ef1302d5b 100644 --- a/typer-cli-python/source_code_final/rptodo/__main__.py +++ b/typer-cli-python/source_code_final/rptodo/__main__.py @@ -1,6 +1,6 @@ """RP To-Do entry point script.""" -from rptodo import cli, __app_name__ +from rptodo import __app_name__, cli def main(): diff --git a/typer-cli-python/source_code_final/tests/test_rptodo.py b/typer-cli-python/source_code_final/tests/test_rptodo.py index 88e98142a5..458929aad5 100644 --- a/typer-cli-python/source_code_final/tests/test_rptodo.py +++ b/typer-cli-python/source_code_final/tests/test_rptodo.py @@ -1,8 +1,6 @@ import json import pytest -from typer.testing import CliRunner - from rptodo import ( DB_READ_ERROR, ID_ERROR, @@ -12,7 +10,7 @@ cli, rptodo, ) - +from typer.testing import CliRunner runner = CliRunner() diff --git a/typer-cli-python/source_code_step_2/rptodo/__main__.py b/typer-cli-python/source_code_step_2/rptodo/__main__.py index 57c45b04a2..0ef1302d5b 100644 --- a/typer-cli-python/source_code_step_2/rptodo/__main__.py +++ b/typer-cli-python/source_code_step_2/rptodo/__main__.py @@ -1,6 +1,6 @@ """RP To-Do entry point script.""" -from rptodo import cli, __app_name__ +from rptodo import __app_name__, cli def main(): diff --git a/typer-cli-python/source_code_step_2/tests/test_rptodo.py b/typer-cli-python/source_code_step_2/tests/test_rptodo.py index d86d142ec2..6013a54241 100644 --- a/typer-cli-python/source_code_step_2/tests/test_rptodo.py +++ b/typer-cli-python/source_code_step_2/tests/test_rptodo.py @@ -1,6 +1,5 @@ -from typer.testing import CliRunner - from rptodo import __app_name__, __version__, cli +from typer.testing import CliRunner runner = CliRunner() diff --git a/typer-cli-python/source_code_step_3/rptodo/__main__.py b/typer-cli-python/source_code_step_3/rptodo/__main__.py index 57c45b04a2..0ef1302d5b 100644 --- a/typer-cli-python/source_code_step_3/rptodo/__main__.py +++ b/typer-cli-python/source_code_step_3/rptodo/__main__.py @@ -1,6 +1,6 @@ """RP To-Do entry point script.""" -from rptodo import cli, __app_name__ +from rptodo import __app_name__, cli def main(): diff --git a/typer-cli-python/source_code_step_3/tests/test_rptodo.py b/typer-cli-python/source_code_step_3/tests/test_rptodo.py index 71946f5760..6013a54241 100644 --- a/typer-cli-python/source_code_step_3/tests/test_rptodo.py +++ b/typer-cli-python/source_code_step_3/tests/test_rptodo.py @@ -1,7 +1,6 @@ +from rptodo import __app_name__, __version__, cli from typer.testing import CliRunner -from rptodo import cli, __app_name__, __version__ - runner = CliRunner() diff --git a/typer-cli-python/source_code_step_4/rptodo/__main__.py b/typer-cli-python/source_code_step_4/rptodo/__main__.py index 57c45b04a2..0ef1302d5b 100644 --- a/typer-cli-python/source_code_step_4/rptodo/__main__.py +++ b/typer-cli-python/source_code_step_4/rptodo/__main__.py @@ -1,6 +1,6 @@ """RP To-Do entry point script.""" -from rptodo import cli, __app_name__ +from rptodo import __app_name__, cli def main(): diff --git a/typer-cli-python/source_code_step_4/tests/test_rptodo.py b/typer-cli-python/source_code_step_4/tests/test_rptodo.py index 71946f5760..6013a54241 100644 --- a/typer-cli-python/source_code_step_4/tests/test_rptodo.py +++ b/typer-cli-python/source_code_step_4/tests/test_rptodo.py @@ -1,7 +1,6 @@ +from rptodo import __app_name__, __version__, cli from typer.testing import CliRunner -from rptodo import cli, __app_name__, __version__ - runner = CliRunner() diff --git a/typer-cli-python/source_code_step_5/rptodo/__main__.py b/typer-cli-python/source_code_step_5/rptodo/__main__.py index 57c45b04a2..0ef1302d5b 100644 --- a/typer-cli-python/source_code_step_5/rptodo/__main__.py +++ b/typer-cli-python/source_code_step_5/rptodo/__main__.py @@ -1,6 +1,6 @@ """RP To-Do entry point script.""" -from rptodo import cli, __app_name__ +from rptodo import __app_name__, cli def main(): diff --git a/typer-cli-python/source_code_step_5/tests/test_rptodo.py b/typer-cli-python/source_code_step_5/tests/test_rptodo.py index daa4fcb4f4..5caab63c15 100644 --- a/typer-cli-python/source_code_step_5/tests/test_rptodo.py +++ b/typer-cli-python/source_code_step_5/tests/test_rptodo.py @@ -1,8 +1,6 @@ import json import pytest -from typer.testing import CliRunner - from rptodo import ( DB_READ_ERROR, SUCCESS, @@ -11,6 +9,7 @@ cli, rptodo, ) +from typer.testing import CliRunner runner = CliRunner() diff --git a/typer-cli-python/source_code_step_6/rptodo/__main__.py b/typer-cli-python/source_code_step_6/rptodo/__main__.py index 57c45b04a2..0ef1302d5b 100644 --- a/typer-cli-python/source_code_step_6/rptodo/__main__.py +++ b/typer-cli-python/source_code_step_6/rptodo/__main__.py @@ -1,6 +1,6 @@ """RP To-Do entry point script.""" -from rptodo import cli, __app_name__ +from rptodo import __app_name__, cli def main(): diff --git a/typer-cli-python/source_code_step_6/tests/test_rptodo.py b/typer-cli-python/source_code_step_6/tests/test_rptodo.py index 0109e1a9fd..a6025f0914 100644 --- a/typer-cli-python/source_code_step_6/tests/test_rptodo.py +++ b/typer-cli-python/source_code_step_6/tests/test_rptodo.py @@ -1,8 +1,6 @@ import json import pytest -from typer.testing import CliRunner - from rptodo import ( DB_READ_ERROR, ID_ERROR, @@ -12,6 +10,7 @@ cli, rptodo, ) +from typer.testing import CliRunner runner = CliRunner() diff --git a/typer-cli-python/source_code_step_7/rptodo/__main__.py b/typer-cli-python/source_code_step_7/rptodo/__main__.py index 57c45b04a2..0ef1302d5b 100644 --- a/typer-cli-python/source_code_step_7/rptodo/__main__.py +++ b/typer-cli-python/source_code_step_7/rptodo/__main__.py @@ -1,6 +1,6 @@ """RP To-Do entry point script.""" -from rptodo import cli, __app_name__ +from rptodo import __app_name__, cli def main(): diff --git a/typer-cli-python/source_code_step_7/tests/test_rptodo.py b/typer-cli-python/source_code_step_7/tests/test_rptodo.py index 6833cf8e4a..458929aad5 100644 --- a/typer-cli-python/source_code_step_7/tests/test_rptodo.py +++ b/typer-cli-python/source_code_step_7/tests/test_rptodo.py @@ -1,8 +1,6 @@ import json import pytest -from typer.testing import CliRunner - from rptodo import ( DB_READ_ERROR, ID_ERROR, @@ -12,6 +10,7 @@ cli, rptodo, ) +from typer.testing import CliRunner runner = CliRunner() diff --git a/understanding-asynchronous-programming/example_3.py b/understanding-asynchronous-programming/example_3.py index 7cbb00cff3..6a5aa34b4c 100644 --- a/understanding-asynchronous-programming/example_3.py +++ b/understanding-asynchronous-programming/example_3.py @@ -1,5 +1,6 @@ -import time import queue +import time + from codetiming import Timer diff --git a/understanding-asynchronous-programming/example_4.py b/understanding-asynchronous-programming/example_4.py index ec2615bea7..d95bb62b43 100644 --- a/understanding-asynchronous-programming/example_4.py +++ b/understanding-asynchronous-programming/example_4.py @@ -1,4 +1,5 @@ import asyncio + from codetiming import Timer diff --git a/understanding-asynchronous-programming/example_5.py b/understanding-asynchronous-programming/example_5.py index b2e373f132..afea769218 100644 --- a/understanding-asynchronous-programming/example_5.py +++ b/understanding-asynchronous-programming/example_5.py @@ -1,4 +1,5 @@ import queue + import requests from codetiming import Timer diff --git a/understanding-asynchronous-programming/example_6.py b/understanding-asynchronous-programming/example_6.py index c82c9d8765..1f4e3d2810 100644 --- a/understanding-asynchronous-programming/example_6.py +++ b/understanding-asynchronous-programming/example_6.py @@ -1,4 +1,5 @@ import asyncio + import aiohttp from codetiming import Timer diff --git a/web-scraping-bs4/scrape_jobs.py b/web-scraping-bs4/scrape_jobs.py index 2c4f010e58..b50dd04e56 100644 --- a/web-scraping-bs4/scrape_jobs.py +++ b/web-scraping-bs4/scrape_jobs.py @@ -1,7 +1,6 @@ import requests from bs4 import BeautifulSoup - URL = "https://realpython.github.io/fake-jobs/" page = requests.get(URL)