Skip to content

Commit 0e1de65

Browse files
committed
test_preprocess: Normalize imports (lint)
1 parent 3709524 commit 0e1de65

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

Orange/preprocess/preprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def __call__(self, data):
198198
return data.transform(domain)
199199

200200

201-
@deprecated
201+
@deprecated("Orange.data.filter.HasClas")
202202
class RemoveNaNClasses(Preprocess):
203203
"""
204204
Construct preprocessor that removes examples with missing class

Orange/tests/test_preprocess.py

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
import os
55
import pickle
66
import unittest
7-
from unittest.mock import Mock, MagicMock, patch
7+
from unittest.mock import Mock
88
import numpy as np
99

10-
import Orange
11-
from Orange.data import Domain, Table, DiscreteVariable
12-
from Orange.preprocess import *
13-
from Orange.preprocess.discretize import *
14-
from Orange.preprocess.fss import *
15-
from Orange.preprocess.impute import *
10+
from Orange.data import Table
11+
from Orange.preprocess import EntropyMDL, DoNotImpute, Default, Average, SelectRandomFeatures, EqualFreq, \
12+
RemoveNaNColumns, DropInstances
13+
from Orange.preprocess import EqualWidth, SelectBestFeatures
14+
from Orange.preprocess.preprocess import Preprocess, Scale, Randomize, Continuize, Discretize, Impute, SklImpute, \
15+
Normalize, ProjectCUR, ProjectPCA, RemoveConstant
1616
from Orange.util import OrangeDeprecationWarning
1717

1818

1919
class TestPreprocess(unittest.TestCase):
2020
def test_read_data_calls_reader(self):
21-
class MockPreprocessor(Orange.preprocess.preprocess.Preprocess):
21+
class MockPreprocessor(Preprocess):
2222
__init__ = Mock(return_value=None)
2323
__call__ = Mock()
2424
@classmethod
2525
def reset(cls):
2626
cls.__init__.reset_mock()
2727
cls.__call__.reset_mock()
2828

29-
table = Mock(Orange.data.Table)
29+
table = Mock(Table)
3030
MockPreprocessor(1, 2, a=3)(table)
3131
MockPreprocessor.__init__.assert_called_with(1, 2, a=3)
3232
MockPreprocessor.__call__.assert_called_with(table)
@@ -52,29 +52,29 @@ def test_refuse_data_in_constructor(self):
5252
expected = self.assertRaises if is_CI else self.assertWarns
5353
with expected(OrangeDeprecationWarning):
5454
try:
55-
Orange.preprocess.preprocess.Preprocess(Table('iris'))
55+
Preprocess(Table('iris'))
5656
except NotImplementedError:
5757
# Expected from default Preprocess.__call__
5858
pass
5959

6060

61-
class RemoveConstant(unittest.TestCase):
61+
class TestRemoveConstant(unittest.TestCase):
6262
def test_remove_columns(self):
6363
X = np.random.rand(6, 4)
6464
X[:, (1,3)] = 5
6565
X[3, 1] = np.nan
6666
X[1, 1] = np.nan
67-
data = Orange.data.Table(X)
68-
d = Orange.preprocess.preprocess.RemoveConstant()(data)
67+
data = Table(X)
68+
d = RemoveConstant()(data)
6969
self.assertEqual(len(d.domain.attributes), 2)
7070

71-
pp_rc = Orange.preprocess.preprocess.RemoveConstant()
71+
pp_rc = RemoveConstant()
7272
d = pp_rc(data)
7373
self.assertEqual(len(d.domain.attributes), 2)
7474

7575
def test_nothing_to_remove(self):
76-
data = Orange.data.Table("iris")
77-
d = Orange.preprocess.preprocess.RemoveConstant()(data)
76+
data = Table("iris")
77+
d = RemoveConstant()(data)
7878
self.assertEqual(len(d.domain.attributes), 4)
7979

8080

@@ -111,6 +111,7 @@ def test_reprs(self):
111111
new_preproc = eval(repr_str)
112112
self.assertEqual(repr(new_preproc), repr_str)
113113

114+
114115
class TestEnumPickling(unittest.TestCase):
115116
def test_continuize_pickling(self):
116117
c = Continuize(multinomial_treatment=Continuize.FirstAsBase)

0 commit comments

Comments
 (0)