8000 Simplify static path checks and resolve strictly by steverep · Pull Request #8491 · aio-libs/aiohttp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Simplify static path checks and resolve strictly #8491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Jul 11, 2024
Merged

Simplify static path checks and resolve strictly #8491

merged 3 commits into from
Jul 11, 2024

Conversation

steverep
Copy link
Member
@steverep steverep commented Jul 11, 2024 •
edited
Loading

What do these changes do?

Just some code I noticed needed an upgrade....

  1. Just chain the expanduser and resolve from the Path instance.
  2. Resolve strictly to check existence and rearrange so error messages make more sense.
  3. Relocate, alter, add tests

Are there changes in behavior for the user?

No

Is it a substantial burden for the maintainers to support this?

No

Related issue number

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES/ folder

    • name it <issue_or_pr_num>.<type>.rst (e.g. 588.bugfix.rst)

    • if you don't have an issue number, change it to the pull request
      number after creating the PR

      • .bugfix: A bug fix for something the maintainers deemed an
        improper undesired behavior that got corrected to match
        pre-agreed expectations.
      • .feature: A new behavior, public APIs. That sort of stuff.
      • .deprecation: A declaration of future API removals and breaking
        changes in behavior.
      • .breaking: When something public is removed in a breaking way.
        Could be deprecated in an earlier release.
      • .doc: Notable updates to the documentation structure or build
        process.
      • .packaging: Notes for downstreams about unobvious side effects
        and tooling. Changes in the test invocation considerations and
        runtime assumptions.
      • .contrib: Stuff that affects the contributor experience. e.g.
        Running tests, building the docs, setting up the development
        environment.
      • .misc: Changes that are hard to assign to any of the above
        categories.

    • Make sure to use full sentences with correct case and punctuation,
      for example:

      Fixed issue with non-ascii contents in doctest text files
-- by :user:`contributor-gh-handle`.

      Use the past tense or the present tense a non-imperative mood,
      referring to what's changed compared to the last released version
      of this project.

@steverep steverep requested a review from asvetlov as a code owner July 11, 2024 00:28
@codecov Codecov
Copy link
codecov bot commented Jul 11, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 92.85714% with 1 line in your changes missing coverage. Please review.

Project coverage is 97.61%. Comparing base (5e36619) to head (5180a14).
Report is 886 commits behind head on master.

Files with missing lines Patch % Lines
tests/test_urldispatch.py 88.88% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #8491      +/-   ##
==========================================
- Coverage   97.61%   97.61%   -0.01%     
==========================================
  Files         107      107              
  Lines       33103    33103              
  Branches     3894     3894              
==========================================
- Hits        32314    32313       -1     
- Misses        570      571       +1     
  Partials      219      219
Flag Coverage Δ
CI-GHA 97.52% <92.85%> (-0.01%) ⬇️
OS-Linux 97.19% <92.85%> (-0.01%) ⬇️
OS-Windows 95.64% <92.85%> (+<0.01%) ⬆️
OS-macOS 96.85% <92.85%> (-0.01%) ⬇️
Py-3.10.11 96.99% <85.71%> (-0.01%) ⬇️
Py-3.10.14 96.95% <85.71%> (-0.01%) ⬇️
Py-3.11.9 97.17% <85.71%> (-0.01%) ⬇️
Py-3.12.4 97.30% <85.71%> (-0.01%) ⬇️
Py-3.8.10 95.41% <85.71%> (ø)
Py-3.8.18 96.84% <85.71%> (-0.01%) ⬇️
Py-3.9.13 96.98% <92.85%> (-0.01%) ⬇️
Py-3.9.19 96.94% <92.85%> (-0.01%) ⬇️
Py-pypy7.3.16 96.51% <92.85%> (-0.01%) ⬇️
VM-macos 96.85% <92.85%> (-0.01%) ⬇️
VM-ubuntu 97.19% <92.85%> (-0.01%) ⬇️
VM-windows 95.64% <92.85%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@steverep steverep requested a review from webknjaz as a code owner July 11, 2024 00:42
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jul 11, 2024
@Dreamsorcerer Dreamsorcerer enabled auto-merge (squash) July 11, 2024 17:06
@Dreamsorcerer Dreamsorcerer merged commit 20d5f6e into aio-libs:master Jul 11, 2024
34 of 37 checks passed
@patchback Patchback
Copy link
Contributor
patchback bot commented Jul 11, 2024 •
edited
Loading

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 20d5f6e on top of patchback/backports/3.10/20d5f6e5421b1794b1d8370ab80b9deddf24f6da/pr-8491

Backporting merged PR #8491 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/3.10/20d5f6e5421b1794b1d8370ab80b9deddf24f6da/pr-8491 upstream/3.10
  4. Now, cherry-pick PR Simplify static path checks and resolve strictly #8491 contents into that branch: 
    $ git cherry-pick -x 20d5f6e5421b1794b1d8370ab80b9deddf24f6da
    If it'll yell at you with something like fatal: Commit 20d5f6e5421b1794b1d8370ab80b9deddf24f6da is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x 20d5f6e5421b1794b1d8370ab80b9deddf24f6da
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Simplify static path checks and resolve strictly #8491 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/3.10/20d5f6e5421b1794b1d8370ab80b9deddf24f6da/pr-8491
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

steverep added a commit to steverep/aiohttp that referenced this pull request Jul 11, 2024
@steverep
[3.10] Simplify static path checks and resolve strictly (aio-libs#8491)
1604de2 
(cherry picked from commit 20d5f6e)

Co-authored-by: Steve Repsher <steverep@users.noreply.github.com>
@steverep steverep deleted the strict-resource-dir-check branch July 11, 2024 17:40
Dreamsorcerer pushed a commit that referenced this pull request Jul 11, 2024
@steverep
[3.10] Simplify static path checks and resolve strictly (#8491) (#8492)
9bfc866 
(cherry picked from commit 20d5f6e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dreamsorcerer Dreamsorcerer Dreamsorcerer left review comments

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

@webknjaz webknjaz Awaiting requested review from webknjaz webknjaz is a code owner

Assignees
No one assigned
Labels
bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@steverep @Dreamsorcerer
0