Skip to content

Commit

Permalink
BUG: pickle compat with UTC tz's
Browse files Browse the repository at this point in the history
  • Loading branch information
jreback committed Jun 6, 2017
1 parent bf99975 commit 472f7f7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
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.
5 changes: 4 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,8 @@ 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'),
u'C': Timestamp('20130603', tz='UTC')}, index=range(5))
)

with catch_warnings(record=True):
Expand Down

0 comments on commit 472f7f7

Please sign in to comment.