Skip to content
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.

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

Upload tarfile file-like objects as data attributes #6747

Merged
merged 9 commits into from
Aug 30, 2024

Conversation

ReallyReivax
Copy link
Contributor

@ReallyReivax ReallyReivax commented May 12, 2022

What do these changes do?

Bugfix to allow for file-like objects from Tarfile's file-like objects.

Why is this not simply fixed in tarfile in CPython? See the two year old pending PR: python/cpython#82753 Note also that this pending PR will change the exception from AttributeError to io.UnsupportedOperation, when the other io.IOBase objects all raise IOError; should consider monitoring for all three variants of the exception.

See also this eight year old conversation that indicates this would technically be an API change to allow fileno to raise an IOError instead of an AttributeError. https://bugs.python.org/issue22208
Because it may be API change, this fix, if accepted today, would not be available until Python 3.13.

Are there changes in behavior for the user?

The only change that should happen is that tarfile works correctly for file-like objects. No other pytest fails. There are no other known file-like objects that behave in this way, so far.

Related issue number

Fixes #6732

@ReallyReivax ReallyReivax requested a review from asvetlov as a code owner May 12, 2022 01:57
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label May 12, 2022
@ReallyReivax ReallyReivax requested a review from webknjaz as a code owner May 12, 2022 02:41
@ReallyReivax ReallyReivax changed the title working fix with tests. Upload tarfile file-like objects as data attributes May 12, 2022
@ReallyReivax
Copy link
Contributor Author

This is ready to go, and this fix is in production for my project. I would appreciate it anyone would review it.

@codecov
Copy link

codecov bot commented Jul 5, 2022

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.26%. Comparing base (5cf5db5) to head (84d0b93).
Report is 1076 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6747   +/-   ##
=======================================
  Coverage   98.26%   98.26%           
=======================================
  Files         107      107           
  Lines       34175    34217   +42     
  Branches     4054     4058    +4     
=======================================
+ Hits        33583    33625   +42     
  Misses        418      418           
  Partials      174      174           
Flag Coverage Δ
CI-GHA 98.16% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.82% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.23% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.50% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.59% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.53% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.76% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.87% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.48% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.42% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.03% <100.00%> (+<0.01%) ⬆️
VM-macos 97.50% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.82% <100.00%> (+<0.01%) ⬆️
VM-windows 96.23% <100.00%> (+<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.

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 30, 2024
@Dreamsorcerer
Copy link
Member

Sorry about the delay, this looks good to me.

@Dreamsorcerer Dreamsorcerer merged commit 7681235 into aio-libs:master Aug 30, 2024
35 of 37 checks passed
Copy link
Contributor

patchback bot commented Aug 30, 2024

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

❌ Failed to cleanly apply 7681235 on top of patchback/backports/3.10/768123537ec988ea629a829623e8d72e7aec1c41/pr-6747

Backporting merged PR #6747 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/768123537ec988ea629a829623e8d72e7aec1c41/pr-6747 upstream/3.10
  4. Now, cherry-pick PR Upload tarfile file-like objects as data attributes #6747 contents into that branch:
    $ git cherry-pick -x 768123537ec988ea629a829623e8d72e7aec1c41
    If it'll yell at you with something like fatal: Commit 768123537ec988ea629a829623e8d72e7aec1c41 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 768123537ec988ea629a829623e8d72e7aec1c41
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Upload tarfile file-like objects as data attributes #6747 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/768123537ec988ea629a829623e8d72e7aec1c41/pr-6747
  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.

Copy link
Contributor

patchback bot commented Aug 30, 2024

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

❌ Failed to cleanly apply 7681235 on top of patchback/backports/3.11/768123537ec988ea629a829623e8d72e7aec1c41/pr-6747

Backporting merged PR #6747 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.11/768123537ec988ea629a829623e8d72e7aec1c41/pr-6747 upstream/3.11
  4. Now, cherry-pick PR Upload tarfile file-like objects as data attributes #6747 contents into that branch:
    $ git cherry-pick -x 768123537ec988ea629a829623e8d72e7aec1c41
    If it'll yell at you with something like fatal: Commit 768123537ec988ea629a829623e8d72e7aec1c41 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 768123537ec988ea629a829623e8d72e7aec1c41
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Upload tarfile file-like objects as data attributes #6747 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/768123537ec988ea629a829623e8d72e7aec1c41/pr-6747
  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.

Dreamsorcerer pushed a commit that referenced this pull request Aug 30, 2024
Dreamsorcerer pushed a commit that referenced this pull request Aug 30, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 30, 2024
(cherry picked from commit 7681235)

Co-authored-by: Xavier Halloran <[email protected]>
Dreamsorcerer added a commit that referenced this pull request Aug 30, 2024
(cherry picked from commit 7681235)

Co-authored-by: Xavier Halloran <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tarfile file-like objects cannot upload as data attributes.
2 participants