8000 MAINT move an orphaned vendored file around · scikit-learn/scikit-learn@e71268f · GitHub
[go: up one dir, main page]
Skip to content

Commit e71268f

Browse files
DimitriPapadopoulosDimitriPapadopoulos
committed
MAINT move an orphaned vendored file around
File scipy/misc/pilutil.py has been removed from Scipy 1.3.0, see scipy/scipy#9325. Move _pilutil.py from scipy/externals, which is the location for vendored files, to scipy/utils, which is a location for locally maintained files.
1 parent 6e2388f commit e71268f

File tree

6 files changed

+5
-5
lines changed

6 files changed

+5
-5
lines changed

‎sklearn/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from sklearn.utils import _IS_32BIT
1111
from sklearn.utils._openmp_helpers import _openmp_effective_n_threads
12-
from sklearn.externals import _pilutil
12+
from sklearn.utils import _pilutil
1313
from sklearn._min_dependencies import PYTEST_MIN_VERSION
1414
from sklearn.utils.fixes import np_version, parse_version
1515
from sklearn.datasets import fetch_20newsgroups

‎sklearn/datasets/_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@ def load_sample_images():
13361336
dtype('uint8')
13371337
"""
13381338
# import PIL only when needed
1339-
from ..externals._pilutil import imread
1339+
from ..utils._pilutil import imread
13401340

13411341
descr = load_descr("README.txt", descr_module=IMAGES_MODULE)
13421342

‎sklearn/datasets/_lfw.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def _check_fetch_lfw(data_home=None, funneled=True, download_if_missing=True):
119119
def _load_imgs(file_paths, slice_, color, resize):
120120
"""Internally used to load images"""
121121
# import PIL only when needed
122-
from ..externals._pilutil import imread, imresize
122+
from ..utils._pilutil import imread, imresize
123123

124124
# compute the portion of the images to load to respect the slice_ parameter
125125
# given by the caller

‎sklearn/datasets/tests/test_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from sklearn.utils._testing import SkipTest
3131
from sklearn.datasets.tests.test_common import check_as_frame
3232

33-
from sklearn.externals._pilutil import pillow_installed
33+
from sklearn.utils._pilutil import pillow_installed
3434

3535
from sklearn.utils import IS_PYPY
3636

‎sklearn/datasets/tests/test_lfw.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import numpy as np
1616
import pytest
1717
from functools import partial
18-
from sklearn.externals._pilutil import pillow_installed, imsave
18+
from sklearn.utils._pilutil import pillow_installed, imsave
1919
from sklearn.datasets import fetch_lfw_pairs
2020
from sklearn.datasets import fetch_lfw_people
2121

‎sklearn/externals/_pilutil.py renamed to ‎sklearn/utils/_pilutil.py

File renamed without changes.

0 commit comments

Comments
 (0)
0