From 26bdc720b71c530560bad0b0826130bede6c7d40 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Tue, 5 Oct 2010 09:20:44 +0200
Subject: [PATCH] Rename features --> feature_extraction to match module
 feature_selection.

---
 scikits/learn/__init__.py                        |  2 +-
 scikits/learn/datasets/mlcomp.py                 |  4 ++--
 .../{features => feature_extraction}/__init__.py |  0
 .../{features => feature_extraction}/image.py    |  0
 .../tests/__init__.py                            |  0
 .../tests/test_image.py                          |  0
 .../tests/test_text.py                           | 16 ++++++++--------
 .../{features => feature_extraction}/text.py     |  0
 scikits/learn/setup.py                           |  4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename scikits/learn/{features => feature_extraction}/__init__.py (100%)
 rename scikits/learn/{features => feature_extraction}/image.py (100%)
 rename scikits/learn/{features => feature_extraction}/tests/__init__.py (100%)
 rename scikits/learn/{features => feature_extraction}/tests/test_image.py (100%)
 rename scikits/learn/{features => feature_extraction}/tests/test_text.py (92%)
 rename scikits/learn/{features => feature_extraction}/text.py (100%)

diff --git a/scikits/learn/__init__.py b/scikits/learn/__init__.py
index a554e4409b..d133caa501 100644
--- a/scikits/learn/__init__.py
+++ b/scikits/learn/__init__.py
@@ -24,7 +24,7 @@ from . import logistic
 from . import lda
 from . import metrics
 from . import svm
-from . import features
+from . import feature_selection
 
 try:
     from numpy.testing import nosetester
diff --git a/scikits/learn/datasets/mlcomp.py b/scikits/learn/datasets/mlcomp.py
index 038d29415c..232543b694 100644
--- a/scikits/learn/datasets/mlcomp.py
+++ b/scikits/learn/datasets/mlcomp.py
@@ -5,8 +5,8 @@
 import os
 import numpy as np
 from scikits.learn.datasets.base import Bunch
-from scikits.learn.features.text import HashingVectorizer
-from scikits.learn.features.text import SparseHashingVectorizer
+from scikits.learn.feature_extraction.text import HashingVectorizer
+from scikits.learn.feature_extraction.text import SparseHashingVectorizer
 
 
 def _load_document_classification(dataset_path, metadata, set_, sparse, **kw):
diff --git a/scikits/learn/features/__init__.py b/scikits/learn/feature_extraction/__init__.py
similarity index 100%
rename from scikits/learn/features/__init__.py
rename to scikits/learn/feature_extraction/__init__.py
diff --git a/scikits/learn/features/image.py b/scikits/learn/feature_extraction/image.py
similarity index 100%
rename from scikits/learn/features/image.py
rename to scikits/learn/feature_extraction/image.py
diff --git a/scikits/learn/features/tests/__init__.py b/scikits/learn/feature_extraction/tests/__init__.py
similarity index 100%
rename from scikits/learn/features/tests/__init__.py
rename to scikits/learn/feature_extraction/tests/__init__.py
diff --git a/scikits/learn/features/tests/test_image.py b/scikits/learn/feature_extraction/tests/test_image.py
similarity index 100%
rename from scikits/learn/features/tests/test_image.py
rename to scikits/learn/feature_extraction/tests/test_image.py
diff --git a/scikits/learn/features/tests/test_text.py b/scikits/learn/feature_extraction/tests/test_text.py
similarity index 92%
rename from scikits/learn/features/tests/test_text.py
rename to scikits/learn/feature_extraction/tests/test_text.py
index f70dcf7326..76444d566e 100644
--- a/scikits/learn/features/tests/test_text.py
+++ b/scikits/learn/feature_extraction/tests/test_text.py
@@ -1,11 +1,11 @@
-from scikits.learn.features.text import strip_accents
-from scikits.learn.features.text import WordNGramAnalyzer
-from scikits.learn.features.text import CharNGramAnalyzer
-from scikits.learn.features.text import TermCountVectorizer
-from scikits.learn.features.text import TfidfTransformer
-from scikits.learn.features.text import TfidfVectorizer
-from scikits.learn.features.text import HashingVectorizer
-from scikits.learn.features.text import SparseHashingVectorizer
+from scikits.learn.feature_extraction.text import strip_accents
+from scikits.learn.feature_extraction.text import WordNGramAnalyzer
+from scikits.learn.feature_extraction.text import CharNGramAnalyzer
+from scikits.learn.feature_extraction.text import TermCountVectorizer
+from scikits.learn.feature_extraction.text import TfidfTransformer
+from scikits.learn.feature_extraction.text import TfidfVectorizer
+from scikits.learn.feature_extraction.text import HashingVectorizer
+from scikits.learn.feature_extraction.text import SparseHashingVectorizer
 from scikits.learn.svm import LinearSVC as DenseLinearSVC
 from scikits.learn.svm.sparse import LinearSVC as SparseLinearSVC
 import numpy as np
diff --git a/scikits/learn/features/text.py b/scikits/learn/feature_extraction/text.py
similarity index 100%
rename from scikits/learn/features/text.py
rename to scikits/learn/feature_extraction/text.py
diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py
index 01f5a5c832..01e4b91d07 100644
--- a/scikits/learn/setup.py
+++ b/scikits/learn/setup.py
@@ -11,8 +11,8 @@ def configuration(parent_package='', top_path=None):
 
     config.add_subpackage('svm')
     config.add_subpackage('datasets')
-    config.add_subpackage('features')
-    config.add_subpackage('features/tests')
+    config.add_subpackage('feature_extraction')
+    config.add_subpackage('feature_extraction/tests')
     config.add_subpackage('cluster')
     config.add_subpackage('cluster/tests')
     config.add_subpackage('covariance')
-- 
GitLab