Skip to content

Commit d1a5392

Browse files
jbrockmendelproost
authored andcommitted
DEPR: remove stata deprecations from 2015 and 2017 (pandas-dev#30176)
1 parent cbba4c2 commit d1a5392

File tree

5 files changed

+3
-47
lines changed

5 files changed

+3
-47
lines changed

doc/redirects.csv

-1
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,6 @@ generated/pandas.io.formats.style.Styler.use,../reference/api/pandas.io.formats.
779779
generated/pandas.io.formats.style.Styler.where,../reference/api/pandas.io.formats.style.Styler.where
780780
generated/pandas.io.json.build_table_schema,../reference/api/pandas.io.json.build_table_schema
781781
generated/pandas.io.json.json_normalize,../reference/api/pandas.io.json.json_normalize
782-
generated/pandas.io.stata.StataReader.data,../reference/api/pandas.io.stata.StataReader.data
783782
generated/pandas.io.stata.StataReader.data_label,../reference/api/pandas.io.stata.StataReader.data_label
784783
generated/pandas.io.stata.StataReader.value_labels,../reference/api/pandas.io.stata.StataReader.value_labels
785784
generated/pandas.io.stata.StataReader.variable_labels,../reference/api/pandas.io.stata.StataReader.variable_labels

doc/source/reference/io.rst

-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ STATA
140140
.. autosummary::
141141
:toctree: api/
142142

143-
StataReader.data
144143
StataReader.data_label
145144
StataReader.value_labels
146145
StataReader.variable_labels

doc/source/whatsnew/v1.0.0.rst

+2
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ or ``matplotlib.Axes.plot``. See :ref:`plotting.formatters` for more.
527527

528528
**Other removals**
529529

530+
- Removed the previously deprecated "index" keyword from :func:`read_stata`, :class:`StataReader`, and :meth:`StataReader.read`, use "index_col" instead (:issue:`17328`)
531+
- Removed the previously deprecated :meth:`StataReader.data` method, use :meth:`StataReader.read` instead (:issue:`9493`)
530532
- Removed the previously deprecated :func:`pandas.plotting._matplotlib.tsplot`, use :meth:`Series.plot` instead (:issue:`19980`)
531533
- :func:`pandas.tseries.converter.register` has been moved to :func:`pandas.plotting.register_matplotlib_converters` (:issue:`18307`)
532534
- :meth:`Series.plot` no longer accepts positional arguments, pass keyword arguments instead (:issue:`30003`)

pandas/io/stata.py

+1-35
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
from pandas._libs.lib import infer_dtype
2525
from pandas._libs.writers import max_len_string_array
26-
from pandas.util._decorators import Appender, deprecate_kwarg
26+
from pandas.util._decorators import Appender
2727

2828
from pandas.core.dtypes.common import (
2929
ensure_object,
@@ -132,25 +132,6 @@
132132
_iterator_params,
133133
)
134134

135-
_data_method_doc = """
136-
Read observations from Stata file, converting them into a dataframe.
137-
138-
.. deprecated::
139-
This is a legacy method. Use `read` in new code.
140-
141-
Parameters
142-
----------
143-
%s
144-
%s
145-
146-
Returns
147-
-------
148-
DataFrame
149-
""" % (
150-
_statafile_processing_params1,
151-
_statafile_processing_params2,
152-
)
153-
154135
_read_method_doc = """\
155136
Reads observations from Stata file, converting them into a dataframe
156137
@@ -191,7 +172,6 @@
191172

192173

193174
@Appender(_read_stata_doc)
194-
@deprecate_kwarg(old_arg_name="index", new_arg_name="index_col")
195175
def read_stata(
196176
filepath_or_buffer,
197177
convert_dates=True,
@@ -1033,7 +1013,6 @@ def __init__(self):
10331013
class StataReader(StataParser, BaseIterator):
10341014
__doc__ = _stata_reader_doc
10351015

1036-
@deprecate_kwarg(old_arg_name="index", new_arg_name="index_col")
10371016
def __init__(
10381017
self,
10391018
path_or_buf,
@@ -1525,18 +1504,6 @@ def _read_strls(self):
15251504
# Wrap v_o in a string to allow uint64 values as keys on 32bit OS
15261505
self.GSO[str(v_o)] = va
15271506

1528-
# legacy
1529-
@Appender(_data_method_doc)
1530-
def data(self, **kwargs):
1531-
1532-
warnings.warn("'data' is deprecated, use 'read' instead")
1533-
1534-
if self._data_read:
1535-
raise Exception("Data has already been read.")
1536-
self._data_read = True
1537-
1538-
return self.read(None, **kwargs)
1539-
15401507
def __next__(self):
15411508
return self.read(nrows=self._chunksize or 1)
15421509

@@ -1558,7 +1525,6 @@ def get_chunk(self, size=None):
15581525
return self.read(nrows=size)
15591526

15601527
@Appender(_read_method_doc)
1561-
@deprecate_kwarg(old_arg_name="index", new_arg_name="index_col")
15621528
def read(
15631529
self,
15641530
nrows=None,

pandas/tests/io/test_stata.py

-10
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,6 @@ def test_read_empty_dta(self, version):
120120
empty_ds2 = read_stata(path)
121121
tm.assert_frame_equal(empty_ds, empty_ds2)
122122

123-
def test_data_method(self):
124-
# Minimal testing of legacy data method
125-
with StataReader(self.dta1_114) as rdr:
126-
with tm.assert_produces_warning(UserWarning):
127-
parsed_114_data = rdr.data()
128-
129-
with StataReader(self.dta1_114) as rdr:
130-
parsed_114_read = rdr.read()
131-
tm.assert_frame_equal(parsed_114_data, parsed_114_read)
132-
133123
@pytest.mark.parametrize("file", ["dta1_114", "dta1_117"])
134124
def test_read_dta1(self, file):
135125

0 commit comments

Comments
 (0)