BUG: don't segfault on Timestamp construction with pendulum objects

closes pandas-dev#15986

Author: jreback

ci/requirements-2.7.pip

@@ -8,3 +8,4 @@ py
 PyCrypto
 mock
 ipython
+pendulum

ci/requirements-3.6.pip

@@ -1 +1,2 @@
 brotlipy
+pendulum

doc/source/whatsnew/v0.23.0.txt

@@ -282,7 +282,7 @@ Conversion
 - Bug in :meth:`Index.astype` with a categorical dtype where the resultant index is not converted to a :class:`CategoricalIndex` for all types of index (:issue:`18630`)
 - Bug in :meth:`Series.astype` and ``Categorical.astype()`` where an existing categorical data does not get updated (:issue:`10696`, :issue:`18593`)
 - Bug in :class:`Series` constructor with an int or float list where specifying ``dtype=str``, ``dtype='str'`` or ``dtype='U'`` failed to convert the data elements to strings (:issue:`16605`)
-
+- Bug ``Timestamp`` construction with ``pendulum`` objects causing a segfault; pandas does not support these. (:issue:`15986`)
 
 Indexing
 ^^^^^^^^

pandas/_libs/tslibs/conversion.pyx

@@ -360,8 +360,7 @@ cdef _TSObject convert_datetime_to_tsobject(datetime ts, object tz,
 
     if not PyDateTime_CheckExact(ts):
         # datetime instance but not datetime type --> Timestamp
-        obj.value += ts.nanosecond
-        obj.dts.ps = ts.nanosecond * 1000
+        nanos = getattr(ts, 'nanosecond', 0)
 
     if nanos:
         obj.value += nanos

pandas/_libs/tslibs/timezones.pyx

@@ -161,7 +161,11 @@ cpdef get_utcoffset(tzinfo, obj):
     try:
         return tzinfo._utcoffset
     except AttributeError:
-        return tzinfo.utcoffset(obj)
+        result = tzinfo.utcoffset(obj)
+        if result is None:
+            raise ValueError("tzinfo of type {} is not supported".format(
+                type(tzinfo)))
+        return result
 
 
 cdef inline bint is_fixed_offset(object tz):

pandas/tests/indexes/datetimes/test_tools.py

@@ -456,6 +456,15 @@ def test_datetime_invalid_datatype(self):
         with pytest.raises(TypeError):
             pd.to_datetime(pd.to_datetime)
 
+    @td.skip_if_no('pendulum')
+    def test_constructor_invalid_tz(self):
+        # construction is ok
+        # gh-15986
+
+        import pendulum
+        with pytest.raises(ValueError):
+            date_range(start=pendulum.now(), end=pendulum.tomorrow())
+
     @pytest.mark.parametrize("utc", [True, None])
     @pytest.mark.parametrize("format", ['%Y%m%d %H:%M:%S', None])
     @pytest.mark.parametrize("box", [True, False])

pandas/tests/scalar/test_timestamp.py

@@ -338,6 +338,24 @@ def test_constructor_offset_depr_fromordinal(self):
             Timestamp.fromordinal(base.toordinal(), offset='D', freq='D')
 
 
+@td.skip_if_no('pendulum')
+class TestTimestampPendulum(object):
+
+    def test_constructor_tz(self):
+        # construction is ok
+        # gh-15986
+
+        import pendulum
+        now = pendulum.datetime(2017, 1, 2, 3, 4, 5, 6)
+
+        # works
+        result = Timestamp(str(now), tz=now.tz)
+        assert 'UTC' in str(result.tz)
+
+        result = Timestamp(now)
+        assert 'UTC' in str(result.tz)
+
+
 class TestTimestamp(object):
 
     def test_conversion(self):

pandas/tests/tseries/test_timezones.py

@@ -1167,6 +1167,29 @@ def test_tz_convert_tzlocal(self):
         tm.assert_numpy_array_equal(dti2.asi8, dti.asi8)
 
 
+@td.skip_if_no('pendulum')
+class TestTimeZoneSupportPendulum(object):
+
+    def test_localize_tz(self):
+        # gh-15986
+
+        import pendulum
+        now = pendulum.datetime(2017, 1, 2, 3, 4, 5, 6)
+        result = Timestamp(now).tz_localize(None)
+        expected = Timestamp('2017-01-02 03:04:05.000006')
+        assert result == expected
+
+    def test_convert_tz(self):
+        # gh-15986
+
+        import pendulum
+        now = pendulum.datetime(2017, 1, 2, 3, 4, 5, 6)
+        result = Timestamp(now).tz_convert('US/Eastern')
+        expected = Timestamp('2017-01-02 03:04:05.000006',
+                             tz='UTC').tz_convert('US/Eastern')
+        assert result == expected
+
+
 class TestTimeZoneCacheKey(object):
 
     def test_cache_keys_are_distinct_for_pytz_vs_dateutil(self):