scikit-learn · thomasjpfan · Dec 20, 2019 · Dec 19, 2019 · Dec 19, 2019 · Dec 20, 2019
diff --git a/sklearn/_build_utils/deprecated_modules.py b/sklearn/_build_utils/deprecated_modules.py
@@ -133,7 +133,7 @@
      'sklearn.datasets', 'make_classification'),
     ('_species_distributions', 'sklearn.datasets.species_distributions',
      'sklearn.datasets', 'fetch_species_distributions'),
-    ('_svmlight_format', 'sklearn.datasets.svmlight_format',
+    ('_svmlight_format_io', 'sklearn.datasets.svmlight_format',
      'sklearn.datasets', 'load_svmlight_file'),
     ('_twenty_newsgroups', 'sklearn.datasets.twenty_newsgroups',
      'sklearn.datasets', 'strip_newsgroup_header'),

diff --git a/sklearn/datasets/__init__.py b/sklearn/datasets/__init__.py
@@ -42,9 +42,9 @@
 from ._samples_generator import make_gaussian_quantiles
 from ._samples_generator import make_biclusters
 from ._samples_generator import make_checkerboard
-from ._svmlight_format import load_svmlight_file
-from ._svmlight_format import load_svmlight_files
-from ._svmlight_format import dump_svmlight_file
+from ._svmlight_format_io import load_svmlight_file
+from ._svmlight_format_io import load_svmlight_files
+from ._svmlight_format_io import dump_svmlight_file
 from ._olivetti_faces import fetch_olivetti_faces
 from ._species_distributions import fetch_species_distributions
 from ._california_housing import fetch_california_housing

diff --git a/sklearn/datasets/_rcv1.py b/sklearn/datasets/_rcv1.py
@@ -23,7 +23,7 @@
 from ._base import _fetch_remote
 from ._base import RemoteFileMetadata
 from ._base import _refresh_cache
-from ._svmlight_format import load_svmlight_files
+from ._svmlight_format_io import load_svmlight_files
 from ..utils import shuffle as shuffle_
 from ..utils import Bunch
 

diff --git a/sklearn/datasets/_svmlight_format.py → sklearn/datasets/_svmlight_format_io.py b/sklearn/datasets/_svmlight_format.py → sklearn/datasets/_svmlight_format_io.py
@@ -453,8 +453,10 @@ def dump_svmlight_file(X, y, f,  zero_based=True, comment=None, query_id=None,
 
     Xval = check_array(X, accept_sparse='csr')
     if Xval.shape[0] != yval.shape[0]:
-        raise ValueError("X.shape[0] and y.shape[0] should be the same, got"
-                         " %r and %r instead." % (Xval.shape[0], yval.shape[0]))
+        raise ValueError(
+            "X.shape[0] and y.shape[0] should be the same, got"
+            " %r and %r instead." % (Xval.shape[0], yval.shape[0])
+        )
 
     # We had some issues with CSR matrices with unsorted indices (e.g. #1501),
     # so sort them here, but first make sure we don't modify the user's X.

diff --git a/sklearn/tests/test_common.py b/sklearn/tests/test_common.py
@@ -179,7 +179,7 @@ def test_import_all_consistency():
     for modname in submods + ['sklearn']:
         if ".tests." in modname:
             continue
-        if IS_PYPY and ('_svmlight_format' in modname or
+        if IS_PYPY and ('_svmlight_format_io' in modname or
                         'feature_extraction._hashing_fast' in modname):
             continue
         package = __import__(modname, fromlist="dummy")

diff --git a/sklearn/tests/test_docstring_parameters.py b/sklearn/tests/test_docstring_parameters.py
@@ -140,7 +140,7 @@ def test_tabs():
     for importer, modname, ispkg in walk_packages(sklearn.__path__,
                                                   prefix='sklearn.'):
 
-        if IS_PYPY and ('_svmlight_format' in modname or
+        if IS_PYPY and ('_svmlight_format_io' in modname or
                         'feature_extraction._hashing_fast' in modname):
             continue
 

diff --git a/sklearn/utils/_testing.py b/sklearn/utils/_testing.py
@@ -466,7 +466,7 @@ def is_abstract(c):
             path=path, prefix='sklearn.', onerror=lambda x: None):
         if ".tests." in modname or "externals" in modname:
             continue
-        if IS_PYPY and ('_svmlight_format' in modname or
+        if IS_PYPY and ('_svmlight_format_io' in modname or
                         'feature_extraction._hashing_fast' in modname):
             continue
         # Ignore deprecation warnings triggered at import time.