From b8a6007e8b5f79249b63407b8a9e5f88422a6ce9 Mon Sep 17 00:00:00 2001 From: hussain Date: Wed, 21 Jun 2017 16:51:14 +0530 Subject: [PATCH 1/3] Test for #16726. unittest that ensures datetime is understood --- pandas/tests/series/test_datetime_values.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandas/tests/series/test_datetime_values.py b/pandas/tests/series/test_datetime_values.py index e1fc9af0cca89..456d337ce2b1c 100644 --- a/pandas/tests/series/test_datetime_values.py +++ b/pandas/tests/series/test_datetime_values.py @@ -409,3 +409,11 @@ def test_date_tz(self): date(2015, 11, 22)]) assert_series_equal(s.dt.date, expected) assert_series_equal(s.apply(lambda x: x.date()), expected) + + def test_datetime_understood(self): + # Ensures it doesn't throw an exception reported in #16726 + try: + pd.Series(pd.date_range("2012-01-01", periods=3)) - pd.offsets.DateOffset(days=6) + except Exception: + assert 'data type "datetime" not understood' + From 2fb87820fe20777c7be107338c330f8883ec3651 Mon Sep 17 00:00:00 2001 From: hussain Date: Thu, 22 Jun 2017 10:10:05 +0530 Subject: [PATCH 2/3] Corrected the test as suggested by @TomAugspurger --- pandas/tests/series/test_datetime_values.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pandas/tests/series/test_datetime_values.py b/pandas/tests/series/test_datetime_values.py index 456d337ce2b1c..8bfcbcee181ce 100644 --- a/pandas/tests/series/test_datetime_values.py +++ b/pandas/tests/series/test_datetime_values.py @@ -411,9 +411,10 @@ def test_date_tz(self): assert_series_equal(s.apply(lambda x: x.date()), expected) def test_datetime_understood(self): - # Ensures it doesn't throw an exception reported in #16726 - try: - pd.Series(pd.date_range("2012-01-01", periods=3)) - pd.offsets.DateOffset(days=6) - except Exception: - assert 'data type "datetime" not understood' + # Ensures it doesn't fail to create the right series reported in issue#16726 + result = pd.Series(pd.date_range("2012-01-01", periods=3)) - pd.offsets.DateOffset(days=6) + expected = pd.Series(pd.to_datetime(['2011-12-26', '2011-12-27', '2011-12-28'])) + tm.assert_series_equal(result, expected) + + From 36960cd3fef212a9d92e14a6031d70aa08b888a7 Mon Sep 17 00:00:00 2001 From: hussain Date: Fri, 23 Jun 2017 10:06:33 +0530 Subject: [PATCH 3/3] Fixed flake8 errors and warnings --- pandas/tests/series/test_datetime_values.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pandas/tests/series/test_datetime_values.py b/pandas/tests/series/test_datetime_values.py index 8bfcbcee181ce..e810eadd2dee9 100644 --- a/pandas/tests/series/test_datetime_values.py +++ b/pandas/tests/series/test_datetime_values.py @@ -411,10 +411,11 @@ def test_date_tz(self): assert_series_equal(s.apply(lambda x: x.date()), expected) def test_datetime_understood(self): - # Ensures it doesn't fail to create the right series reported in issue#16726 - result = pd.Series(pd.date_range("2012-01-01", periods=3)) - pd.offsets.DateOffset(days=6) - expected = pd.Series(pd.to_datetime(['2011-12-26', '2011-12-27', '2011-12-28'])) + # Ensures it doesn't fail to create the right series + # reported in issue#16726 + series = pd.Series(pd.date_range("2012-01-01", periods=3)) + offset = pd.offsets.DateOffset(days=6) + result = series - offset + expected = pd.Series(pd.to_datetime([ + '2011-12-26', '2011-12-27', '2011-12-28'])) tm.assert_series_equal(result, expected) - - -