8000 Make fixes private · scikit-learn/scikit-learn@c9dc88f · GitHub
[go: up one dir, main page]
Skip to content

Commit c9dc88f

Browse files
rthrth
committed
Make fixes private
1 parent 128d460 commit c9dc88f

File tree

11 files changed

+19
-14
lines changed

11 files changed

+19
-14
lines changed

‎sklearn/covariance/graph_lasso_.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from ..exceptions import ConvergenceWarning
2020
from ..utils.validation import check_random_state, check_array
2121
from ..utils import deprecated
22-
from ..utils.fixes import Sequence
22+
from ..utils.fixes import _Sequence as Sequence
2323
from ..linear_model import lars_path
2424
from ..linear_model import cd_fast
2525
from ..model_selection import check_cv, cross_val_score

‎sklearn/datasets/samples_generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from ..preprocessing import MultiLabelBinarizer
1616
from ..utils import check_array, check_random_state
1717
from ..utils import shuffle as util_shuffle
18-
from ..utils.fixes import Iterable
18+
from ..utils.fixes import _Iterable as Iterable
1919
from ..utils.random import sample_without_replacement
2020
from ..externals import six
2121
map = six.moves.map

‎sklearn/feature_extraction/dict_vectorizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from ..externals import six
1313
from ..externals.six.moves import xrange
1414
from ..utils import check_array, tosequence
15-
from ..utils.fixes import Mapping
15+
from ..utils.fixes import _Mapping as Mapping
1616

1717

1818
def _tosequence(X):

‎sklearn/feature_extraction/tests/test_text.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
clean_warning_registry, ignore_warnings,
3434
SkipTest, assert_raises,
3535
assert_allclose_dense_sparse)
36-
from sklearn.utils.fixes import Mapping
36+
from sklearn.utils.fixes import _Mapping as Mapping
3737
from collections import defaultdict
3838
from functools import partial
3939
import pickle

‎sklearn/metrics/scorer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from .cluster import fowlkes_mallows_score
4040

4141
from ..utils.multiclass import type_of_target
42-
from ..utils.fixes import Iterable
42+
from ..utils.fixes import _Iterable as Iterable
4343
from ..externals import six
4444
from ..base import is_regressor
4545

‎sklearn/model_selection/_search.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
from ..utils import check_random_state
3535
from ..utils.fixes import sp_version
3636
from ..utils.fixes import MaskedArray
37-
from ..utils.fixes import Mapping, Sequence, Iterable
37+
from ..utils.fixes import _Mapping as Mapping, _Sequence as Sequence
38+
from ..utils.fixes import _Iterable as Iterable
3839
from ..utils.random import sample_without_replacement
3940
from ..utils.validation import indexable, check_is_fitted
4041
from ..utils.metaestimators import if_delegate_has_method

‎sklearn/model_selection/_split.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from ..externals.six import with_metaclass
2929
from ..externals.six.moves import zip
3030
from ..utils.fixes import signature, comb
31-
from ..utils.fixes import Iterable
31+
from ..utils.fixes import _Iterable as Iterable
3232
from ..base import _pprint
3333

3434
__all__ = ['BaseCrossValidator',

‎sklearn/model_selection/tests/test_search.py

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

1515
from sklearn.utils.fixes import sp_version
1616
from sklearn.utils.fixes import PY3_OR_LATER
17-
from sklearn.utils.fixes import Iterable, Sized
17+
from sklearn.utils.fixes import _Iterable as Iterable, _Sized as Sized
1818
from sklearn.utils.testing import assert_equal
1919
from sklearn.utils.testing import assert_not_equal
2020
from sklearn.utils.testing import assert_raises

‎sklearn/utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from .class_weight import compute_class_weight, compute_sample_weight
1818
from ..externals.joblib import cpu_count
1919
from ..exceptions import DataConversionWarning
20-
from ..utils.fixes import Sequence
20+
from ..utils.fixes import _Sequence as Sequence
2121
from .deprecation import deprecated
2222
from .. import get_config
2323

‎sklearn/utils/fixes.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,12 @@ def _object_dtype_isnan(X):
301301

302302
# To be removed once this fix is included in six
303303
try:
304-
from collections.abc import Sequence, Iterable # noqa
305-
from collections.abc import Mapping, Sized # noqa
304+
from collections.abc import Sequence as _Sequence # noqa
305+
from collections.abc import Iterable as _Iterable # noqa
306+
from collections.abc import Mapping as _Mapping # noqa
307+
from collections.abc import Sized as _Sized # noqa
306308
except ImportError: # python <3.3
307-
from collections import Sequence, Iterable # noqa
308-
from collections import Mapping, Sized # noqa
309+
from collections import Sequence as _Sequence # noqa
310+
from collections import Iterable as _Iterable # noqa
311+
from collections import Mapping as _Mapping # noqa
312+
from collections import Sized as _Sized # noqa

0 commit comments

Comments
 (0)
0