Merge branch 'fix6641_pr' of https://github.com/jsexauer/pandas into jsexauer-fix6641_pr

Conflicts:
	doc/source/v0.14.0.txt

Author: jreback

doc/source/release.rst

@@ -195,6 +195,28 @@ Prior Version Deprecations/Changes
 
 - Remove ``column`` keyword from ``DataFrame.sort`` (:issue:`4370`)
 
+- Remove ``precision`` keyword from :func:`set_eng_float_format` (:issue:`6641`)
+
+- Remove ``force_unicode`` keyword from :meth:`DataFrame.to_string`,
+  :meth:`DataFrame.to_latex`, and :meth:`DataFrame.to_html`; these function
+  encode in unicode by default (:issue:`6641`)
+
+- Remove ``nanRep`` keyword from :meth:`DataFrame.to_csv` and
+  :meth:`DataFrame.to_string` (:issue:`6641`)
+
+- Remove ``unique`` keyword from :meth:`HDFStore.select_column` (:issue:`6641`)
+
+- Remove ``inferTimeRule`` keyword from :func:`Timestamp.offset` (:issue:`6641`)
+
+- Remove ``name`` keyword from :func:`get_data_yahoo` and
+  :func:`get_data_google` (:issue:`6641`)
+
+- Remove ``offset`` keyword from :class:`DatetimeIndex` constructor
+  (:issue:`6641`)
+
+- Remove ``time_rule`` from several rolling-moment statistical functions, such
+  as :func:`rolling_sum` (:issue:`6641`)
+
 Experimental Features
 ~~~~~~~~~~~~~~~~~~~~~
 

doc/source/v0.14.0.txt

@@ -21,6 +21,8 @@ users upgrade to this version.
 
 - :ref:`API Changes <whatsnew_0140.api>`
 
+- :ref:`Prior Deprecations <whatsnew_0140.prior_deprecations>`
+
 - :ref:`Deprecations <whatsnew_0140.deprecations>`
 
 - :ref:`Bug Fixes <release.bug_fixes-0.14.0>`
@@ -344,13 +346,37 @@ Plotting
 
   Because of the default `align` value changes, coordinates of bar plots are now located on integer values (0.0, 1.0, 2.0 ...). This is intended to make bar plot be located on the same coodinates as line plot. However, bar plot may differs unexpectedly when you manually adjust the bar location or drawing area, such as using `set_xlim`, `set_ylim`, etc. In this cases, please modify your script to meet with new coordinates.
 
+.. _whatsnew_0140.prior_deprecations:
+
 Prior Version Deprecations/Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 There are prior version deprecations that are taking effect as of 0.14.0.
 
 - Remove ``column`` keyword from ``DataFrame.sort`` (:issue:`4370`)
 
+- Remove ``precision`` keyword from :func:`set_eng_float_format` (:issue:`6641`)
+
+- Remove ``force_unicode`` keyword from :meth:`DataFrame.to_string`,
+  :meth:`DataFrame.to_latex`, and :meth:`DataFrame.to_html`; these function
+  encode in unicode by default (:issue:`6641`)
+
+- Remove ``nanRep`` keyword from :meth:`DataFrame.to_csv` and
+  :meth:`DataFrame.to_string` (:issue:`6641`)
+
+- Remove ``unique`` keyword from :meth:`HDFStore.select_column` (:issue:`6641`)
+
+- Remove ``inferTimeRule`` keyword from :func:`Timestamp.offset` (:issue:`6641`)
+
+- Remove ``name`` keyword from :func:`get_data_yahoo` and
+  :func:`get_data_google` (:issue:`6641`)
+
+- Remove ``offset`` keyword from :class:`DatetimeIndex` constructor
+  (:issue:`6641`)
+
+- Remove ``time_rule`` from several rolling-moment statistical functions, such
+  as :func:`rolling_sum` (:issue:`6641`)
+
 .. _whatsnew_0140.deprecations:
 
 Deprecations
@@ -414,13 +440,12 @@ Enhancements
   and data_label which allow the time stamp and dataset label to be set when creating a
   file. (:issue:`6545`)
 - ``pandas.io.gbq`` now handles reading unicode strings properly. (:issue:`5940`)
-- Improve performance of ``CustomBusinessDay`` (:issue:`6584`)
 - :ref:`Holidays Calendars<timeseries.holiday>` are now available and can be used with CustomBusinessDay (:issue:`6719`)
 
 Performance
 ~~~~~~~~~~~
 
-- perf improvements in DataFrame construction with certain offsets, by removing faulty caching
+- Improve performance of DataFrame construction with certain offsets, by removing faulty caching
   (e.g. MonthEnd,BusinessMonthEnd), (:issue:`6479`)
 - Improve performance of ``CustomBusinessDay`` (:issue:`6584`)
 - improve performance of slice indexing on Series with string keys (:issue:`6341`, :issue:`6372`)

pandas/core/format.py

@@ -358,15 +358,10 @@ def _to_str_columns(self):
 
         return strcols
 
-    def to_string(self, force_unicode=None):
+    def to_string(self):
         """
         Render a DataFrame to a console-friendly tabular output.
         """
-        import warnings
-        if force_unicode is not None:  # pragma: no cover
-            warnings.warn(
-                "force_unicode is deprecated, it will have no effect",
-                FutureWarning)
 
         frame = self.frame
 
@@ -423,8 +418,7 @@ def _join_multiline(self, *strcols):
             st = ed
         return '\n\n'.join(str_lst)
 
-    def to_latex(self, force_unicode=None, column_format=None,
-                 longtable=False):
+    def to_latex(self, column_format=None, longtable=False):
         """
         Render a DataFrame to a LaTeX tabular/longtable environment output.
         """
@@ -435,12 +429,6 @@ def get_col_type(dtype):
             else:
                 return 'l'
 
-        import warnings
-        if force_unicode is not None:  # pragma: no cover
-            warnings.warn(
-                "force_unicode is deprecated, it will have no effect",
-                FutureWarning)
-
         frame = self.frame
 
         if len(frame.columns) == 0 or len(frame.index) == 0:
@@ -2139,19 +2127,14 @@ def __call__(self, num):
         return formatted  # .strip()
 
 
-def set_eng_float_format(precision=None, accuracy=3, use_eng_prefix=False):
+def set_eng_float_format(accuracy=3, use_eng_prefix=False):
     """
     Alter default behavior on how float is formatted in DataFrame.
     Format float in engineering format. By accuracy, we mean the number of
     decimal digits after the floating point.
 
     See also EngFormatter.
     """
-    if precision is not None:  # pragma: no cover
-        import warnings
-        warnings.warn("'precision' parameter in set_eng_float_format is "
-                      "being renamed to 'accuracy'", FutureWarning)
-        accuracy = precision
 
     set_option("display.float_format", EngFormatter(accuracy, use_eng_prefix))
     set_option("display.column_space", max(12, accuracy + 9))

pandas/core/frame.py

@@ -1065,7 +1065,7 @@ def to_panel(self):
     @deprecate_kwarg(old_arg_name='cols', new_arg_name='columns')
     def to_csv(self, path_or_buf=None, sep=",", na_rep='', float_format=None,
                columns=None, header=True, index=True, index_label=None,
-               mode='w', nanRep=None, encoding=None, quoting=None,
+               mode='w', encoding=None, quoting=None,
                quotechar='"', line_terminator='\n', chunksize=None,
                tupleize_cols=False, date_format=None, doublequote=True,
                escapechar=None, **kwds):
@@ -1122,10 +1122,6 @@ def to_csv(self, path_or_buf=None, sep=",", na_rep='', float_format=None,
             Format string for datetime objects
         cols : kwarg only alias of columns [deprecated]
         """
-        if nanRep is not None:  # pragma: no cover
-            warnings.warn("nanRep is deprecated, use na_rep",
-                          FutureWarning)
-            na_rep = nanRep
 
         formatter = fmt.CSVFormatter(self, path_or_buf,
                                      line_terminator=line_terminator,
@@ -1269,21 +1265,12 @@ def to_stata(
     @Appender(fmt.docstring_to_string, indents=1)
     def to_string(self, buf=None, columns=None, col_space=None, colSpace=None,
                   header=True, index=True, na_rep='NaN', formatters=None,
-                  float_format=None, sparsify=None, nanRep=None,
-                  index_names=True, justify=None, force_unicode=None,
-                  line_width=None, max_rows=None, max_cols=None,
+                  float_format=None, sparsify=None, index_names=True,
+                  justify=None, line_width=None, max_rows=None, max_cols=None,
                   show_dimensions=False):
         """
         Render a DataFrame to a console-friendly tabular output.
         """
-        if force_unicode is not None:  # pragma: no cover
-            warnings.warn("force_unicode is deprecated, it will have no "
-                          "effect", FutureWarning)
-
-        if nanRep is not None:  # pragma: no cover
-            warnings.warn("nanRep is deprecated, use na_rep",
-                          FutureWarning)
-            na_rep = nanRep
 
         if colSpace is not None:  # pragma: no cover
             warnings.warn("colSpace is deprecated, use col_space",
@@ -1312,9 +1299,8 @@ def to_string(self, buf=None, columns=None, col_space=None, colSpace=None,
     def to_html(self, buf=None, columns=None, col_space=None, colSpace=None,
                 header=True, index=True, na_rep='NaN', formatters=None,
                 float_format=None, sparsify=None, index_names=True,
-                justify=None, force_unicode=None, bold_rows=True,
-                classes=None, escape=True, max_rows=None, max_cols=None,
-                show_dimensions=False):
+                justify=None, bold_rows=True, classes=None, escape=True,
+                max_rows=None, max_cols=None, show_dimensions=False):
         """
         Render a DataFrame as an HTML table.
 
@@ -1335,10 +1321,6 @@ def to_html(self, buf=None, columns=None, col_space=None, colSpace=None,
 
         """
 
-        if force_unicode is not None:  # pragma: no cover
-            warnings.warn("force_unicode is deprecated, it will have no "
-                          "effect", FutureWarning)
-
         if colSpace is not None:  # pragma: no cover
             warnings.warn("colSpace is deprecated, use col_space",
                           FutureWarning)
@@ -1366,7 +1348,7 @@ def to_html(self, buf=None, columns=None, col_space=None, colSpace=None,
     def to_latex(self, buf=None, columns=None, col_space=None, colSpace=None,
                  header=True, index=True, na_rep='NaN', formatters=None,
                  float_format=None, sparsify=None, index_names=True,
-                 bold_rows=True, force_unicode=None, longtable=False):
+                 bold_rows=True, longtable=False):
         """
         Render a DataFrame to a tabular environment table. You can splice
         this into a LaTeX document. Requires \\usepackage(booktabs}.
@@ -1381,10 +1363,6 @@ def to_latex(self, buf=None, columns=None, col_space=None, colSpace=None,
 
         """
 
-        if force_unicode is not None:  # pragma: no cover
-            warnings.warn("force_unicode is deprecated, it will have no "
-                          "effect", FutureWarning)
-
         if colSpace is not None:  # pragma: no cover
             warnings.warn("colSpace is deprecated, use col_space",
                           FutureWarning)

pandas/core/series.py

@@ -881,7 +881,7 @@ def _repr_footer(self):
                                                str(self.dtype.name))
 
     def to_string(self, buf=None, na_rep='NaN', float_format=None,
-                  nanRep=None, length=False, dtype=False, name=False):
+                  length=False, dtype=False, name=False):
         """
         Render a string representation of the Series
 
@@ -906,10 +906,6 @@ def to_string(self, buf=None, na_rep='NaN', float_format=None,
         formatted : string (if not buffer passed)
         """
 
-        if nanRep is not None:  # pragma: no cover
-            warnings.warn("nanRep is deprecated, use na_rep", FutureWarning)
-            na_rep = nanRep
-
         the_repr = self._get_repr(float_format=float_format, na_rep=na_rep,
                                   length=length, dtype=dtype, name=name)
 

pandas/io/data.py

@@ -338,11 +338,7 @@ def _dl_mult_symbols(symbols, start, end, chunksize, retry_count, pause,
 
 
 def _get_data_from(symbols, start, end, retry_count, pause, adjust_price,
-                   ret_index, chunksize, source, name):
-    if name is not None:
-        warnings.warn("Arg 'name' is deprecated, please use 'symbols' "
-                      "instead.", FutureWarning)
-        symbols = name
+                   ret_index, chunksize, source):
 
     src_fn = _source_functions[source]
 
@@ -367,7 +363,7 @@ def _get_data_from(symbols, start, end, retry_count, pause, adjust_price,
 
 def get_data_yahoo(symbols=None, start=None, end=None, retry_count=3,
                    pause=0.001, adjust_price=False, ret_index=False,
-                   chunksize=25, name=None):
+                   chunksize=25):
     """
     Returns DataFrame/Panel of historical stock prices from symbols, over date
     range, start to end. To avoid being penalized by Yahoo! Finance servers,
@@ -402,12 +398,12 @@ def get_data_yahoo(symbols=None, start=None, end=None, retry_count=3,
     hist_data : DataFrame (str) or Panel (array-like object, DataFrame)
     """
     return _get_data_from(symbols, start, end, retry_count, pause,
-                          adjust_price, ret_index, chunksize, 'yahoo', name)
+                          adjust_price, ret_index, chunksize, 'yahoo')
 
 
 def get_data_google(symbols=None, start=None, end=None, retry_count=3,
                     pause=0.001, adjust_price=False, ret_index=False,
-                    chunksize=25, name=None):
+                    chunksize=25):
     """
     Returns DataFrame/Panel of historical stock prices from symbols, over date
     range, start to end. To avoid being penalized by Google Finance servers,
@@ -436,7 +432,7 @@ def get_data_google(symbols=None, start=None, end=None, retry_count=3,
     hist_data : DataFrame (str) or Panel (array-like object, DataFrame)
     """
     return _get_data_from(symbols, start, end, retry_count, pause,
-                          adjust_price, ret_index, chunksize, 'google', name)
+                          adjust_price, ret_index, chunksize, 'google')
 
 
 _FRED_URL = "http://research.stlouisfed.org/fred2/series/"

pandas/io/pytables.py

@@ -684,13 +684,6 @@ def select_as_coordinates(
         return self.get_storer(key).read_coordinates(where=where, start=start,
                                                      stop=stop, **kwargs)
 
-    def unique(self, key, column, **kwargs):
-        warnings.warn("unique(key,column) is deprecated\n"
-                      "use select_column(key,column).unique() instead",
-                      FutureWarning)
-        return self.get_storer(key).read_column(column=column,
-                                                **kwargs).unique()
-
     def select_column(self, key, column, **kwargs):
         """
         return a single column from the table. This is generally only useful to