Merge remote-tracking branch 'upstream/master' into fix-25514

Author: sakarpanta

doc/source/whatsnew/v0.25.0.rst

@@ -362,6 +362,7 @@ I/O
 - Bug in ``read_csv`` which would not raise ``ValueError`` if a column index in ``usecols`` was out of bounds (:issue:`25623`)
 - Improved the explanation for the failure when value labels are repeated in Stata dta files and suggested work-arounds (:issue:`25772`)
 - Improved :meth:`pandas.read_stata` and :class:`pandas.io.stata.StataReader` to read incorrectly formatted 118 format files saved by Stata (:issue:`25960`)
+- Fixed bug in loading objects from S3 that contain ``#`` characters in the URL (:issue:`25945`)
 
 Plotting
 ^^^^^^^^
@@ -407,6 +408,7 @@ Sparse
 Other
 ^^^^^
 
+- Improved :class:`Timestamp` type checking in various datetime functions to prevent exceptions when using a subclassed `datetime` (:issue:`25851`)
 - Bug in :class:`Series` and :class:`DataFrame` repr where ``np.datetime64('NaT')`` and ``np.timedelta64('NaT')`` with ``dtype=object`` would be represented as ``NaN`` (:issue:`25445`)
 -
 -

mypy.ini

@@ -140,45 +140,9 @@ ignore_errors=True
 [mypy-pandas.io.clipboards]
 ignore_errors=True
 
-[mypy-pandas.io.feather_format]
-ignore_errors=True
-
-[mypy-pandas.io.html]
-ignore_errors=True
-
-[mypy-pandas.io.json.json]
-ignore_errors=True
-
-[mypy-pandas.io.json.normalize]
-ignore_errors=True
-
-[mypy-pandas.io.json.table_schema]
-ignore_errors=True
-
-[mypy-pandas.io.packers]
-ignore_errors=True
-
-[mypy-pandas.io.parquet]
-ignore_errors=True
-
 [mypy-pandas.io.pytables]
 ignore_errors=True
 
-[mypy-pandas.io.stata]
-ignore_errors=True
-
-[mypy-pandas.plotting._core]
-ignore_errors=True
-
-[mypy-pandas.tseries.frequencies]
-ignore_errors=True
-
-[mypy-pandas.tseries.holiday]
-ignore_errors=True
-
-[mypy-pandas.tseries.offsets]
-ignore_errors=True
-
 [mypy-pandas.util._doctools]
 ignore_errors=True
 

pandas/__init__.py

@@ -20,7 +20,9 @@
 del hard_dependencies, dependency, missing_dependencies
 
 # numpy compat
-from pandas.compat.numpy import *
+from pandas.compat.numpy import (
+    _np_version_under1p14, _np_version_under1p15, _np_version_under1p16,
+    _np_version_under1p17)
 
 try:
     from pandas._libs import (hashtable as _hashtable,
@@ -42,14 +44,72 @@
 # let init-time option registration happen
 import pandas.core.config_init
 
-from pandas.core.api import *
-from pandas.core.sparse.api import *
-from pandas.tseries.api import *
-from pandas.core.computation.api import *
-from pandas.core.reshape.api import *
+from pandas.core.api import (
+    # dtype
+    Int8Dtype, Int16Dtype, Int32Dtype, Int64Dtype, UInt8Dtype,
+    UInt16Dtype, UInt32Dtype, UInt64Dtype, CategoricalDtype,
+    PeriodDtype, IntervalDtype, DatetimeTZDtype,
+
+    # missing
+    isna, isnull, notna, notnull,
+
+    # indexes
+    Index, CategoricalIndex, Int64Index, UInt64Index, RangeIndex,
+    Float64Index, MultiIndex, IntervalIndex, TimedeltaIndex,
+    DatetimeIndex, PeriodIndex, IndexSlice,
+
+    # tseries
+    NaT, Period, period_range, Timedelta, timedelta_range,
+    Timestamp, date_range, bdate_range, Interval, interval_range,
+    DateOffset,
+
+    # conversion
+    to_numeric, to_datetime, to_timedelta,
+
+    # misc
+    np, TimeGrouper, Grouper, factorize, unique, value_counts,
+    array, Categorical, set_eng_float_format, Series, DataFrame,
+    Panel)
+
+from pandas.core.sparse.api import (
+    SparseArray, SparseDataFrame, SparseSeries, SparseDtype)
+
+from pandas.tseries.api import infer_freq
+from pandas.tseries import offsets
+
+from pandas.core.computation.api import eval
+
+from pandas.core.reshape.api import (
+    concat, lreshape, melt, wide_to_long, merge, merge_asof,
+    merge_ordered, crosstab, pivot, pivot_table, get_dummies,
+    cut, qcut)
 
 from pandas.util._print_versions import show_versions
-from pandas.io.api import *
+
+from pandas.io.api import (
+    # excel
+    ExcelFile, ExcelWriter, read_excel,
+
+    # packers
+    read_msgpack, to_msgpack,
+
+    # parsers
+    read_csv, read_fwf, read_table,
+
+    # pickle
+    read_pickle, to_pickle,
+
+    # pytables
+    HDFStore, read_hdf,
+
+    # sql
+    read_sql, read_sql_query,
+    read_sql_table,
+
+    # misc
+    read_clipboard, read_parquet, read_feather, read_gbq,
+    read_html, read_json, read_stata, read_sas)
+
 from pandas.util._tester import test
 import pandas.testing
 import pandas.arrays

pandas/_libs/tslib.pyx

@@ -2,7 +2,6 @@
 import cython
 
 from cpython.datetime cimport (PyDateTime_Check, PyDate_Check,
-                               PyDateTime_CheckExact,
                                PyDateTime_IMPORT,
                                timedelta, datetime, date, time)
 # import datetime C API
@@ -19,6 +18,7 @@ import pytz
 from pandas._libs.util cimport (
     is_integer_object, is_float_object, is_datetime64_object)
 
+from pandas._libs.tslibs.c_timestamp cimport _Timestamp
 
 from pandas._libs.tslibs.np_datetime cimport (
     check_dts_bounds, npy_datetimestruct, _string_to_dts, dt64_to_dtstruct,
@@ -539,8 +539,7 @@ cpdef array_to_datetime(ndarray[object] values, str errors='raise',
                                              'datetime64 unless utc=True')
                     else:
                         iresult[i] = pydatetime_to_dt64(val, &dts)
-                        if not PyDateTime_CheckExact(val):
-                            # i.e. a Timestamp object
+                        if isinstance(val, _Timestamp):
                             iresult[i] += val.nanosecond
                         check_dts_bounds(&dts)
 

pandas/_libs/tslibs/c_timestamp.pxd

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from cpython.datetime cimport datetime
+
+from numpy cimport int64_t
+
+cdef class _Timestamp(datetime):
+    cdef readonly:
+        int64_t value, nanosecond
+        object freq
+        list _date_attributes
+    cpdef bint _get_start_end_field(self, str field)
+    cpdef _get_date_name_field(self, object field, object locale)
+    cdef int64_t _maybe_convert_value_to_local(self)
+    cpdef to_datetime64(self)
+    cdef _assert_tzawareness_compat(_Timestamp self, datetime other)
+    cpdef datetime to_pydatetime(_Timestamp self, bint warn=*)
+    cdef bint _compare_outside_nanorange(_Timestamp self, datetime other,
+                                         int op) except -1