Skip to content

Commit d297e89

Browse files
committed
data.io.sanitize_variable: Remove deprecated arguments
1 parent ceb5df0 commit d297e89

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

Orange/data/io.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,9 @@ def guess_data_type(orig_values, namask=None):
170170

171171

172172
def sanitize_variable(valuemap, values, orig_values, coltype, coltype_kwargs,
173-
domain_vars=None, existing_var=None, new_var_name=None, data=None, name=None):
173+
name=None):
174174
assert issubclass(coltype, Variable)
175175

176-
if name is None or existing_var is not None or new_var_name is not None:
177-
name = existing_var.strip() if existing_var else new_var_name
178-
raise DeprecationWarning("Arguments 'existing_var' and 'new_var_name' are "\
179-
"deprecated since 3.16; use 'name' instead")
180-
181-
if domain_vars is not None:
182-
raise DeprecationWarning("Argument 'domain_vars' is deprecated since 3.16")
183-
184-
if data is not None:
185-
raise DeprecationWarning("Argument 'data' is deprecated since 3.16")
186-
187176
def get_number_of_decimals(values):
188177
len_ = len
189178
ndecimals = max((len_(value) - value.find(".")

Orange/tests/test_io.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
import shutil
88
import io
99

10-
from Orange.data import ContinuousVariable
11-
from Orange.data.io import FileFormat, TabReader, CSVReader, PickleReader, \
12-
sanitize_variable
10+
from Orange.data.io import FileFormat, TabReader, CSVReader, PickleReader
1311
from Orange.data.table import get_sample_datasets_dir
14-
from Orange.version import version
1512

1613

1714
class WildcardReader(FileFormat):
@@ -118,12 +115,3 @@ def test_empty_columns(self):
118115
self.assertEqual(len(table.domain.attributes), 2)
119116
self.assertEqual(cm.warning.args[0],
120117
"Columns with no headers were removed.")
121-
122-
123-
class TestIo(unittest.TestCase):
124-
def test_sanitize_variable_deprecated_params(self):
125-
"""In version 3.18 deprecation warnings in function 'sanitize_variable'
126-
should be removed along with unused parameters."""
127-
if version > "3.18":
128-
_, _ = sanitize_variable(None, None, None, ContinuousVariable,
129-
{}, name="name", data="data")

0 commit comments

Comments
 (0)