Skip to content

Commit ff6bd57

Browse files
committed
BUG: fix python 3 zip usage
1 parent f198721 commit ff6bd57

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

pandas/tests/test_format.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import numpy as np
1717

1818
from pandas import DataFrame, Series, Index
19+
from pandas.util.py3compat import lzip
1920
import pandas.core.format as fmt
2021
import pandas.util.testing as tm
2122
import pandas
@@ -178,7 +179,7 @@ def test_to_string_with_formatters(self):
178179
('float', lambda x: '[% 4.1f]' % x),
179180
('object', lambda x: '-%s-' % str(x))]
180181
result = df.to_string(formatters=dict(formatters))
181-
result2 = df.to_string(formatters=zip(*formatters)[1])
182+
result2 = df.to_string(formatters=lzip(*formatters)[1])
182183
self.assertEqual(result, (' int float object\n'
183184
'0 0x1 [ 1.0] -(1, 2)-\n'
184185
'1 0x2 [ 2.0] -True-\n'

pandas/util/py3compat.py

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ def str_to_bytes(s, encoding='ascii'):
1212
def bytes_to_str(b, encoding='utf-8'):
1313
return b.decode(encoding)
1414

15+
lzip = lambda *args: list(zip(*args))
1516
else:
1617
# Python 2
1718
import re
@@ -26,6 +27,8 @@ def str_to_bytes(s, encoding='ascii'):
2627
def bytes_to_str(b, encoding='ascii'):
2728
return b
2829

30+
lzip = zip
31+
2932
try:
3033
from cStringIO import StringIO
3134
except:
@@ -35,3 +38,5 @@ def bytes_to_str(b, encoding='ascii'):
3538
from io import BytesIO
3639
except:
3740
from cStringIO import StringIO as BytesIO
41+
42+

0 commit comments

Comments
 (0)