Skip to content

Commit

Permalink
BUG: pickle compat with UTC tz's (#16611)
Browse files Browse the repository at this point in the history
closes #16608

(cherry picked from commit 697d026)
  • Loading branch information
jreback authored and TomAugspurger committed Jul 7, 2017
1 parent 2814061 commit 0e57df9
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 2 deletions.
2 changes: 2 additions & 0 deletions doc/source/whatsnew.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ What's New

These are new features and improvements of note in each release.

.. include:: whatsnew/v0.20.3.txt

.. include:: whatsnew/v0.20.2.txt

.. include:: whatsnew/v0.20.0.txt
Expand Down
89 changes: 89 additions & 0 deletions doc/source/whatsnew/v0.20.3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
.. _whatsnew_0203:

v0.20.3 (June ??, 2017)
-----------------------

This is a minor bug-fix release in the 0.20.x series and includes some small regression fixes,
bug fixes and performance improvements.
We recommend that all users upgrade to this version.

.. contents:: What's new in v0.20.3
:local:
:backlinks: none


.. _whatsnew_0203.enhancements:

Enhancements
~~~~~~~~~~~~






.. _whatsnew_0203.performance:

Performance Improvements
~~~~~~~~~~~~~~~~~~~~~~~~






.. _whatsnew_0203.bug_fixes:

Bug Fixes
~~~~~~~~~




Conversion
^^^^^^^^^^

- Bug in pickle compat prior to the v0.20.x series, when ``UTC`` is a timezone in a Series/DataFrame/Index (:issue:`16608`)

Indexing
^^^^^^^^



I/O
^^^



Plotting
^^^^^^^^




Groupby/Resample/Rolling
^^^^^^^^^^^^^^^^^^^^^^^^



Sparse
^^^^^^




Reshaping
^^^^^^^^^



Numeric
^^^^^^^


Categorical
^^^^^^^^^^^


Other
^^^^^
2 changes: 1 addition & 1 deletion pandas/compat/pickle_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def load_reduce(self):
args = stack.pop()
func = stack[-1]

if type(args[0]) is type:
if len(args) and type(args[0]) is type:
n = args[0].__name__ # noqa

try:
Expand Down
Binary file not shown.
8 changes: 7 additions & 1 deletion pandas/tests/io/generate_legacy_storage_files.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/env/bin python

""" self-contained to write legacy storage (pickle/msgpack) files """
from __future__ import print_function
from warnings import catch_warnings
Expand Down Expand Up @@ -125,7 +127,11 @@ def create_data():
mixed_dup=mixed_dup_df,
dt_mixed_tzs=DataFrame({
u'A': Timestamp('20130102', tz='US/Eastern'),
u'B': Timestamp('20130603', tz='CET')}, index=range(5))
u'B': Timestamp('20130603', tz='CET')}, index=range(5)),
dt_mixed2_tzs=DataFrame({
u'A': Timestamp('20130102', tz='US/Eastern'),
u'B': Timestamp('20130603', tz='CET'),
u'C': Timestamp('20130603', tz='UTC')}, index=range(5))
)

with catch_warnings(record=True):
Expand Down

0 comments on commit 0e57df9

Please sign in to comment.