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

bpo-31802: Fix importing native path module before importing os. #4017

Merged

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Oct 17, 2017

@@ -486,6 +486,10 @@ def test_relpath_errors(self):
with self.assertRaisesRegex(TypeError, 'bytearray'):
self.pathmodule.relpath(bytearray(b'foo'), bytearray(b'bar'))

def test_import(self):
support.script_helper.assert_python_ok(
Copy link
Member

@zware zware Jan 7, 2018

Choose a reason for hiding this comment

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

support.script_helper needs to be imported.

@bedevere-bot
Copy link

bedevere-bot commented Jan 7, 2018

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

@serhiy-storchaka
Copy link
Member Author

serhiy-storchaka commented Jan 7, 2018

Thanks @zware! I have made the requested changes; please review again.

@bedevere-bot
Copy link

bedevere-bot commented Jan 7, 2018

Thanks for making the requested changes!

@zware: please review the changes made to this pull request.

zware
zware approved these changes Jan 7, 2018
@miss-islington
Copy link
Contributor

miss-islington commented Jan 7, 2018

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6.
🐍🍒🤖

@serhiy-storchaka serhiy-storchaka deleted the native-os-path-cycle-import branch Jan 7, 2018
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 7, 2018
@bedevere-bot
Copy link

bedevere-bot commented Jan 7, 2018

GH-5129 is a backport of this pull request to the 3.6 branch.

@miss-islington
Copy link
Contributor

miss-islington commented Jan 7, 2018

Sorry, @serhiy-storchaka, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3460198f6ba40a839f105c381f07179aba1e8c61 2.7

serhiy-storchaka pushed a commit that referenced this pull request Jan 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type-bug An unexpected behavior, bug, or error
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants