Skip to content

MAINT: Change the order of checking for locale file and import urllib modules #12762

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

Merged
merged 1 commit into from
Jan 17, 2019
Merged

MAINT: Change the order of checking for locale file and import urllib modules #12762

merged 1 commit into from
Jan 17, 2019

Conversation

EelcoPeacs
Copy link
Contributor

ENH: Changed the sequence of checking for locale existence of a file and importing urllib modules in numpy._datasource.py to prevent the import in case the local file was found

See #12536

…and importing urllib modules in numpy._datasource.py to prevent the import in case the local file was found

See #12536
@charris charris changed the title ENH: Changed the sequence of checking for locale file and import urllib modules MAINT: Change the order of checking for locale file and import urllib modules Jan 17, 2019
@charris
Copy link
Member

charris commented Jan 17, 2019

LGTM. Did this actually fix your problem? Why was the _socket object/module missing?

@charris charris added the 09 - Backport-Candidate PRs tagged should be backported label Jan 17, 2019
@charris charris added this to the 1.16.1 release milestone Jan 17, 2019
@charris charris merged commit 4e72483 into numpy:master Jan 17, 2019
@charris
Copy link
Member

charris commented Jan 17, 2019

Thanks @EelcoPeacs .

@charris
Copy link
Member

charris commented Jan 17, 2019

I notice that your commit message is badly formed. All lines in the message should be < 72 characters in length and separated by line breaks, with a blank line after the summary line at the top. There should be a plugin for your editor that does that for you.

@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Jan 17, 2019
@charris charris removed this from the 1.16.1 release milestone Jan 17, 2019
@EelcoPeacs EelcoPeacs deleted the local_datasource_first branch January 18, 2019 08:29
@EelcoPeacs
Copy link
Contributor Author

Thanks for the merge. Yes, this fix solved my problem and is also a minor improvement on the sequence of the code for checking file existence. I encountered the problem in a program that incorporates a dedicated build of Python, Seg3D. This special build does not incorporate all libraries.
Sorry for the badly formed commit. I'll improve this next time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants