Skip to content

Fix tostring unicode #1804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2012
Merged

Fix tostring unicode #1804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf65e0
TST: Failing test for to_string with non-ascii string
jseabold Aug 22, 2012
b722906
BUG: Safely decode strings to unicode
jseabold Aug 22, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions pandas/core/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,23 @@ def _to_str_columns(self, force_unicode=False):

if not py3compat.PY3:
if force_unicode:
strcols = map(lambda col: map(unicode, col), strcols)
def make_unicode(x):
if isinstance(x, unicode):
return x
return x.decode('utf-8')
strcols = map(lambda col: map(make_unicode, col), strcols)
else:
# generally everything is plain strings, which has ascii
# encoding. problem is when there is a char with value over 127
# - everything then gets converted to unicode.
try:
map(lambda col: map(str, col), strcols)
except UnicodeError:
strcols = map(lambda col: map(unicode, col), strcols)
def make_unicode(x):
if isinstance(x, unicode):
return x
return x.decode('utf-8')
strcols = map(lambda col: map(make_unicode, col), strcols)

return strcols

Expand Down
8 changes: 8 additions & 0 deletions pandas/tests/test_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-

try:
from StringIO import StringIO
except:
Expand Down Expand Up @@ -110,6 +112,12 @@ def test_to_string_unicode_three(self):
buf = StringIO()
dm.to_string(buf)

def test_to_string_force_unicode(self):
#given string with non-ascii characters
df = DataFrame([["aaää", 1], ["bbbb", 2]])
result = df.to_string(force_unicode=True)
self.assertEqual(result, u' 0 1\n0 aa\xe4\xe4 1\n1 bbbb 2')

def test_to_string_with_formatters(self):
df = DataFrame({'int': [1, 2, 3],
'float': [1.0, 2.0, 3.0],
Expand Down