revised

Author: jreback

doc/source/whatsnew/v0.20.0.txt

@@ -537,9 +537,9 @@ Deprecations
 - ``Series/DataFrame/Panel.consolidate()`` been deprecated as a public method. (:issue:`15483`)
 - ``FrozenList`` addition (new object and inplace) have been deprecated in favor of the ``.union()`` method. (:issue: `15475`)
 - The following top-level pandas functions have been deprecated and will be removed in a future version (:issue:`13790`)
-  * ``pd.now()``, replaced by a direct import from ``pandas.tseries.period``
-  * ``pd.Term``, replaced by a direct import from ``pandas.io.pytables``
-  * ``pd.Expr``, replaced by a direct import from ``pandas.computation.expr``
+  * ``pd.pnow()``, replaced by ``Period.now()``
+  * ``pd.Term``, not applicable to the user
+  * ``pd.Expr``, not applicable to the user
   * ``pd.match()``, replaced by a direct import from ``pandas.core.algorithms``
   * ``pd.groupby()``, replaced by using the ``.groupby()`` method directly on a ``Series/DataFrame``
 

pandas/computation/api.py

@@ -7,7 +7,8 @@
 def Expr(*args, **kwargs):
     import warnings
 
-    warnings.warn("pd.Expr is deprecated. Please import from pandas.computation.expr",
+    warnings.warn("pd.Expr is deprecated as it is not "
+                  "applicable to user code",
                   FutureWarning, stacklevel=2)
     from pandas.computation.expr import Expr
     return Expr(*args, **kwargs)

pandas/io/api.py

@@ -22,7 +22,9 @@
 def Term(*args, **kwargs):
     import warnings
 
-    warnings.warn("pd.Term is deprecated. Please import from pandas.io.pytables",
+    warnings.warn("pd.Term is deprecated as it is not "
+                  "applicable to user code. Instead use in-line "
+                  "string expressions in for searching HDFStore",
                   FutureWarning, stacklevel=2)
     from pandas.io.pytables import Term
     return Term(*args, **kwargs)

pandas/tests/scalar/test_period.py

@@ -864,17 +864,11 @@ def test_properties_nat(self):
             self.assertTrue(np.isnan(getattr(t_nat, f)))
 
     def test_pnow(self):
-        dt = datetime.now()
 
-        val = period.pnow('D')
-        exp = Period(dt, freq='D')
-        self.assertEqual(val, exp)
-
-        val2 = period.pnow('2D')
-        exp2 = Period(dt, freq='2D')
-        self.assertEqual(val2, exp2)
-        self.assertEqual(val.ordinal, val2.ordinal)
-        self.assertEqual(val.ordinal, exp2.ordinal)
+        # deprecation, xref #13790
+        with tm.assert_produces_warning(FutureWarning,
+                                        check_stacklevel=False):
+            period.pnow('D')
 
     def test_constructor_corner(self):
         expected = Period('2007-01', freq='2M')

pandas/tseries/api.py

@@ -7,17 +7,8 @@
 from pandas.tseries.index import DatetimeIndex, date_range, bdate_range
 from pandas.tseries.frequencies import infer_freq
 from pandas.tseries.tdi import Timedelta, TimedeltaIndex, timedelta_range
-from pandas.tseries.period import Period, PeriodIndex, period_range
+from pandas.tseries.period import Period, PeriodIndex, period_range, pnow
 from pandas.tseries.resample import TimeGrouper
 from pandas.tseries.timedeltas import to_timedelta
 from pandas.lib import NaT
 import pandas.tseries.offsets as offsets
-
-# deprecation, xref #13790
-def pnow(freq=None):
-    import warnings
-
-    warnings.warn("pd.pnow() is deprecated. Please use pandas.tseries.period.pnow()",
-                  FutureWarning, stacklevel=2)
-    from pandas.tseries.period import pnow
-    return pnow(freq=freq)

pandas/tseries/period.py

@@ -1144,7 +1144,13 @@ def _make_field_arrays(*fields):
 
 
 def pnow(freq=None):
-    return Period(datetime.now(), freq=freq)
+    # deprecation, xref #13790
+    import warnings
+
+    warnings.warn("pd.pnow() and pandas.tseries.period.pnow() "
+                  "are deprecated. Please use Period.now()",
+                  FutureWarning, stacklevel=2)
+    return Period.now(freq=freq)
 
 
 def period_range(start=None, end=None, periods=None, freq='D', name=None):