Skip to content

Fix backward incompatibility introduced in 2.4.16 (#535)#542

Merged
althonos merged 9 commits intoPyFilesystem:masterfrom
tfeldmann:master
Aug 19, 2022
Merged

Fix backward incompatibility introduced in 2.4.16 (#535)#542
althonos merged 9 commits intoPyFilesystem:masterfrom
tfeldmann:master

Conversation

@tfeldmann
Copy link
Contributor

@tfeldmann tfeldmann commented Jul 7, 2022

Type of changes

  • Bug fix
  • Tests

Checklist

  • I've run the latest black with default args on new code.
  • I've updated CHANGELOG.md and CONTRIBUTORS.md where appropriate.
  • I've added tests for new code.
  • I accept that @PyFilesystem/maintainers may be pedantic in the code review.

Description

Added overwrite=True to the optimized path in fs.move.move_file. move_file now behaves like in versions <2.4.16.

@coveralls
Copy link

coveralls commented Jul 7, 2022 •
edited
Loading

Coverage Status

Coverage remained the same at 94.814% when pulling 93c2579 on tfeldmann:master into 11ad1ec on PyFilesystem:master.

lurch
lurch reviewed Jul 8, 2022
View reviewed changes
lurch
lurch reviewed Jul 8, 2022
View reviewed changes
@tfeldmann
Copy link
Contributor Author

tfeldmann commented Jul 8, 2022 •
edited
Loading

I found another case where the optimized and the regular code path behave differently:

with open_fs(fs_url) as tmp:
    tmp.writetext("file.txt", "content")
    fs.move.move_file(tmp, "file.txt", tmp, "file.txt")

If you move a file onto itself, the optimized code path works as expected, but the regular code path happens to delete the file. This is not wanted, I guess? I added some code to fix this.

EDIT:
I found this happens also if you do some_fs.move("file.txt", "file.txt", overwrite=True). It deletes the file. Is this expected?

@lurch
Copy link
Contributor

lurch commented Jul 8, 2022

Eeek! If attempting to move a file onto itself, I guess it makes sense to just early-exit? 🤔

lurch
lurch reviewed Jul 8, 2022
View reviewed changes
@althonos althonos mentioned this pull request Jul 13, 2022
Merged
4 tasks
@Wallaku
Copy link

Wallaku commented Jul 21, 2022

What stops this PR from being resolved?
@althonos
@tfeldmann

@lurch
Copy link
Contributor

lurch commented Jul 21, 2022

I still think you ought to do normpath on src_path and dst_path before comparing them, in case they contain relative-paths like foo/../bar ?
(also, you'll need to rebase this PR to resolve the conflicts)

@tfeldmann
Copy link
Contributor Author

tfeldmann commented Jul 21, 2022 •
edited
Loading

Yep, some things left to do on my side. Didn't have the time yet.

@lurch
Copy link
Contributor

lurch commented Jul 21, 2022

I found this happens also if you do some_fs.move("file.txt", "file.txt", overwrite=True). It deletes the file.

@tfeldmann Can you create an issue for https://github.com/PyFilesystem/pyfilesystem2/blob/master/fs/base.py#L1138 please?

lurch
lurch approved these changes Jul 21, 2022
View reviewed changes
Copy link
Contributor

@lurch lurch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@tfeldmann
Copy link
Contributor Author

tfeldmann commented Jul 21, 2022

@tfeldmann Can you create an issue for https://github.com/PyFilesystem/pyfilesystem2/blob/master/fs/base.py#L1138 please?

On it!

@lurch lurch mentioned this pull request Jul 21, 2022
Open
@tfeldmann tfeldmann mentioned this pull request Jul 21, 2022
Open
@Wallaku
Copy link

Wallaku commented Jul 21, 2022

HOORAY! Good job everybody let's bump a version for this library already!
@lurch

@Wallaku
Copy link

Wallaku commented Jul 31, 2022

Anyone?
@lurch
@althonos

lurch
lurch reviewed Jul 31, 2022
View reviewed changes
@tfeldmann tfeldmann requested a review from althonos August 16, 2022 07:27
@althonos althonos merged commit 59f6e4d into PyFilesystem:master Aug 19, 2022
@althonos
Copy link
Member

althonos commented Aug 19, 2022

Great job @tfeldmann !

abichinger pushed a commit to abichinger/pyfilesystem2 that referenced this pull request Sep 28, 2025
@tfeldmann @abichinger
fix: backward incompatibility introduced in 2.4.16 (PyFilesystem#542)
f84055e 
* add default overwrite arg (fixes PyFilesystem#535)
* update changelog
* add tests
* fix deletion when moving file on itself
* compare normalized pathes in early exit
* check no longer needed
* remove unused import
github-actions bot pushed a commit to abichinger/pyfilesystem2 that referenced this pull request Sep 28, 2025
@semantic-release-bot
chore(release): 2.4.17 [skip ci]
ecde7ff 
## [2.4.17](v2.4.16...v2.4.17) (2025-09-28)

### Bug Fixes

* add failing tests ([ba8b583](ba8b583))
* Added filter_glob and exclude_glob to fs.walk.Walker. ([7d91dc8](7d91dc8))
* assert DestinationExists when using overwrite=False ([5efca65](5efca65))
* assert no files were touched ([6d9e696](6d9e696))
* backward incompatibility introduced in 2.4.16 ([PyFilesystem#542](https://github.com/abichinger/pyfilesystem2/issues/542)) ([f84055e](f84055e)), closes [PyFilesystem#535](https://github.com/abichinger/pyfilesystem2/issues/535)
* Changes from code review. ([fa8f924](fa8f924))
* copy_structure FS can be of type str ([1d0b87e](1d0b87e))
* copydir hangup ([52c5597](52c5597))
* drop the final remaining use of the deprecated pkg_resources module ([7e8e923](7e8e923))
* establish new errors.IllegalDestination ([a751c9b](a751c9b))
* memoryfs ([0bb7597](0bb7597))
* migrate entrypoints handling to standard library importlib.metadata ([61c198e](61c198e))
* new error names ([988ca09](988ca09))
* osfs ([7df6d97](7df6d97))
* OSFS copy ([799239e](799239e))
* raise DestinationExists if overwrite is not set ([39d0534](39d0534))
* Set `timeout-minutes` in the `test.yml` Actions workflow ([PyFilesystem#548](https://github.com/abichinger/pyfilesystem2/issues/548)) ([ae69d3e](ae69d3e))
* typo in `docs/source/info.rst` ([PyFilesystem#544](https://github.com/abichinger/pyfilesystem2/issues/544)) ([c3cfb76](c3cfb76))
* use validatepath ([9160080](9160080))
* uses validated paths in copydir ([d09b2cc](d09b2cc))
* wip copy ([09763c8](09763c8))
* wrapfs ([f0bf836](f0bf836))
* wrapfs does not need checks sprinkled everywhere anymore ([6b64e92](6b64e92))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lurch lurch lurch approved these changes

@althonos althonos althonos approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@tfeldmann @coveralls @lurch @Wallaku @althonos