Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork33.7k
gh-118507 : Refactornt._path_is*#118755
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
44 commits Select commitHold shift + click to select a range
ab76c06 Speedup `ntpath.exists`
nineteendo1c5350d Update comment
nineteendod7017ac 📜🤖 Added by blurb_it.
blurb-it[bot]2963338 Improve `nt_exists()`
nineteendoe833f04 Apply suggestions from code review
nineteendod0493c2 Revert helper functions
nineteendo4403f4a Update argument clinic
nineteendo7a9038f Update 2024-04-13-11-30-09.gh-issue-117841.eW4w_y.rst
nineteendoa6ec86d Merge branch 'main' into speedup-ntpath.lexists
nineteendo30603f0 Refactor `nt._path_is*`
nineteendocd7c6d0 Add `nt._path_isjunction`
nineteendo168d299 Fix bug & further refactoring
nineteendoe00df4c Fix attribute name
nineteendob31a252 Add test for pipe
nineteendo59e1407 Skip unless `os.pipe` is available
nineteendo76acc0d 📜🤖 Added by blurb_it.
blurb-it[bot]2c8e464 Update Modules/posixmodule.c
nineteendoa8bc5f2 Update Modules/posixmodule.c
nineteendo55b6b80 Update Lib/test/test_ntpath.py
nineteendo61a62ce Fix compilation errors
nineteendoba79151 Update Modules/posixmodule.c
nineteendo5153413 Merge branch 'refactor-nt._path_is' into speedup-ntpath.lexists
nineteendo01568bb Merge pull request #1 from nineteendo/speedup-ntpath.lexists
nineteendo07629c6 Merge news entries
nineteendo0fcffb5 Replace ampersand
nineteendocae7a55 More refactoring
nineteendocbf0bc4 Update generated code
nineteendo4c0a3f7 Fix path conversion
nineteendo5bf963e Fix undefined variable
nineteendo71cb7f0 Add helper function
nineteendo24d2749 Apply suggestions from code review
nineteendo6edc3b3 Fix syntax error
nineteendoc6dae2c Further refactoring
nineteendo05dd20e Ternary operator
nineteendo2ced928 Fix attributes
nineteendodfd4196 No inline
nineteendo7a7e942 Apply suggestions from code review
nineteendo50b3612 Update posixmodule.c
nineteendoeab1cb4 Update Modules/posixmodule.c
nineteendo6f6b07b Update Modules/posixmodule.c
nineteendo0ca58a0 Update posixmodule.c
nineteendo3f1ea76 Update Modules/posixmodule.c
nineteendo222c58a Update test_ntpath.py
nineteendo6e41cbf Update Lib/test/test_ntpath.py
nineteendoFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Add helper function
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit71cb7f02b7f5890d20f3e3496c8f36082c961807
There are no files selected for viewing
65 changes: 25 additions & 40 deletionsModules/posixmodule.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -5095,6 +5095,22 @@ os__path_splitroot_impl(PyObject *module, path_t *path) | ||
| #define PY_IFLRP 16 // Link Reparse Point (name-surrogate, symlink, junction) | ||
nineteendo marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| #define PY_IFRRP 32 // Regular Reparse Point | ||
| static inline BOOL | ||
| _testReparseTag(DWORD reparseTag, int testedType) | ||
nineteendo marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| { | ||
| switch (testedType) { | ||
| case PY_IFLNK: | ||
| return reparseTag == IO_REPARSE_TAG_SYMLINK; | ||
| case PY_IFMNT: | ||
| return reparseTag == IO_REPARSE_TAG_MOUNT_POINT; | ||
| case PY_IFLRP: | ||
| return IsReparseTagNameSurrogate(reparseTag); | ||
| case PY_IFRRP: | ||
| return reparseTag && !IsReparseTagNameSurrogate(reparseTag); | ||
| } | ||
| return FALSE | ||
nineteendo marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } | ||
| static BOOL | ||
| _testFileTypeByHandle(HANDLE hfile, int testedType, BOOL diskOnly) | ||
| { | ||
| @@ -5133,16 +5149,7 @@ _testFileTypeByHandle(HANDLE hfile, int testedType, BOOL diskOnly) | ||
| } | ||
| if (attributes & FILE_ATTRIBUTE_REPARSE_POINT) { | ||
| return _testReparseTag(reparseTag, testedType); | ||
| } | ||
| else if (testedType == PY_IFREG) { | ||
| return ((fileDevType == FILE_TYPE_DISK) && | ||
| @@ -5167,26 +5174,18 @@ _testFileTypeByName(LPCWSTR path, int testedType) | ||
| sizeof(info))) | ||
| { | ||
| if (info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { | ||
| if (testedType == PY_IFREG) { | ||
| if (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) { | ||
| return FALSE; | ||
| } | ||
| } | ||
| else if (testedType ==PY_IFDIR) { | ||
| if (!(info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { | ||
| return FALSE; | ||
| } | ||
| } | ||
| else { | ||
| return _testReparseTag(info.ReparseTag, testedType); | ||
| } | ||
| } | ||
| else if (testedType == PY_IFREG) { | ||
| @@ -5229,22 +5228,8 @@ _testFileTypeByName(LPCWSTR path, int testedType) | ||
| if (testedType == PY_IFDIR) { | ||
| return !STAT(path, &st) && S_ISDIR(st.st_mode); | ||
| } | ||
| return (!LSTAT(path, &st) && | ||
| _testReparseTag(st.st_reparse_tag, testedType)) | ||
| } | ||
| return FALSE; | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.