From 472f7f7559b0bb209a3a600ecbc95ddc53b7a53a Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 6 Jun 2017 06:06:45 -0400 Subject: [PATCH] BUG: pickle compat with UTC tz's closes #16608 --- pandas/compat/pickle_compat.py | 2 +- .../0.19.2/0.19.2_x86_64_darwin_3.6.1.pickle | Bin 125349 -> 125543 bytes .../tests/io/generate_legacy_storage_files.py | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 pandas/tests/io/generate_legacy_storage_files.py diff --git a/pandas/compat/pickle_compat.py b/pandas/compat/pickle_compat.py index b875bbb0d63c00..f6223c48994ae2 100644 --- a/pandas/compat/pickle_compat.py +++ b/pandas/compat/pickle_compat.py @@ -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: diff --git a/pandas/tests/io/data/legacy_pickle/0.19.2/0.19.2_x86_64_darwin_3.6.1.pickle b/pandas/tests/io/data/legacy_pickle/0.19.2/0.19.2_x86_64_darwin_3.6.1.pickle index 6bb02672a4151c8d6536127fc94e68634e56c86d..48ea5d0df4705669e7fbd99b7ee18a0d8f6d9c0f 100644 GIT binary patch delta 741 zcmZ2_nf>_{c9sT~sqZ$jTvVK#ASuEaGWnjW)?|LAJCjS4RJ<7e9$5O9S(t$UJ*8wy zQihmc#!|nGZCPg-85nw4;zL86r%axr88oG|ZA#FT)X54$ij&t%a8BM}o;NwvLV9wB zvNcET6pajqYq*P-TVKx}@(GP%)0oblDk3jOk`p- z*sQB_n~AY!GN--^e<>@nL+dBU=-UhA1I08O!ESfSaLp>(yjtIdk+Ej-2ZKDu*2(dP z(m=h{h8kcK3Clw;gH`H^9V_#TA5)!vL5YdSO5)=tSfFuBo4g?}}QJtu(nNHAqB zoqWzHg|TR}v9S~*9^I0YYfadJ_B)uy0qvh}Dn41kl!dWplBtSJ575|7XBKt_1_n?> zwgaQ94G5Dmsg~o#X9dWb$c!7yejQWOt@dmNT#y2nUL3HiDh*lHr;awK>CD1BIZ;H48^LFvywOY;NioPF zwPqlPEHje>iXSx#gBZdJHe@olg$htE)?5nW0e&5^$)~h}x!vo3Fn|HjH$WSa6>m1M zU}6+}0(CqzJlWYMe-IUCl4YB$C@0Qj%r@CyQJm4Uxz}=guO;KmM8<>L)n_vr`Y|d^ Rk9^6v7ZKLe?Oriz0sv%*uf_lX diff --git a/pandas/tests/io/generate_legacy_storage_files.py b/pandas/tests/io/generate_legacy_storage_files.py old mode 100644 new mode 100755 index 22c62b738e6a22..27ae6197aac49b --- a/pandas/tests/io/generate_legacy_storage_files.py +++ b/pandas/tests/io/generate_legacy_storage_files.py @@ -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 @@ -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):