File tree 3 files changed +9
-2
lines changed
3 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,7 @@ Bug Fixes
44
44
- Compat with python 3.6 for pickling of some offsets (:issue:`14685`)
45
45
- Compat with python 3.6 for some indexing exception types (:issue:`14684`)
46
46
- Compat with python 3.6 for deprecation warnings in the test suite (:issue:`14681`)
47
+ - Compat with python 3.6 for Timestamp pickles (:issue:``)
47
48
48
49
49
50
Original file line number Diff line number Diff line change @@ -1105,6 +1105,12 @@ cdef class _Timestamp(datetime):
1105
1105
self ._assert_tzawareness_compat(other)
1106
1106
return _cmp_scalar(self .value, ots.value, op)
1107
1107
1108
+ def __reduce_ex__ (self , protocol ):
1109
+ # python 3.6 compat
1110
+ # http://bugs.python.org/issue28730
1111
+ # now __reduce_ex__ is defined and higher priority than __reduce__
1112
+ return self .__reduce__()
1113
+
1108
1114
def __repr__ (self ):
1109
1115
stamp = self ._repr_base
1110
1116
zone = None
Original file line number Diff line number Diff line change @@ -196,8 +196,8 @@ def _is_unorderable_exception(e):
196
196
These are different error message for PY>=3<=3.5 and PY>=3.6
197
197
"""
198
198
if PY36 :
199
- return ( "'>' not supported between instances "
200
- "of 'str' and 'int'" in str ( e ))
199
+ return "'>' not supported between instances of" in str ( e )
200
+
201
201
elif PY3 :
202
202
return 'unorderable' in str (e )
203
203
return False
You can’t perform that action at this time.
0 commit comments