10000 [MRG+1] Fix import of reload for python 3.3 by amueller · Pull Request #5773 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

[MRG+1] Fix import of reload for python 3.3 #5773

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.

Sign up for GitHub

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
Dec 10, 2015
Merged

[MRG+1] Fix import of reload for python 3.3 #5773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions sklearn/tests/test_discriminant_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
# Python 3+ import for reload. Builtin in Python2
if version[1] == 3:
reload = None
from importlib import reload
else:
from importlib import reload


# Data is just 6 separable points in the plane
Expand Down Expand Up @@ -305,7 +306,7 @@ def test_qda_regularization():

def test_deprecated_lda_qda_deprecation():
if reload is None:
SkipTest("Can't reload module on Python3.3")
raise SkipTest("Can't reload module on Python3.3")

def import_lda_module():
import sklearn.lda
Expand Down
0