Skip to content
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

resolve python2 str() issue #4030

Merged
merged 5 commits into from
Dec 9, 2017
Merged

resolve python2 str() issue #4030

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7a9779
make string conversion use utf8
timifasubaa Dec 7, 2017
c25f7fa
Update viz.py
timifasubaa Dec 7, 2017
1401253
make utf-8 consistent with other usages
timifasubaa Dec 8, 2017
d430959
Update viz.py
timifasubaa Dec 8, 2017
cbc163d
Update viz.py
timifasubaa Dec 8, 2017
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
4 changes: 2 additions & 2 deletions superset/viz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,9 +1300,9 @@ def get_data(self, df):
for i, v in ys.iteritems():
x = i
if isinstance(x, (tuple, list)):
x = ', '.join([str(s) for s in x])
x = ', '.join([str(s.encode('utf8')) for s in x])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you want to use six.text_type(s) instead.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

time to upgrade to py3!

Copy link
Contributor Author

@timifasubaa timifasubaa Dec 8, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@john-bodley I tried six.text_type but it didn't work. python 2 str uses ascii encoding scheme by default so it will break unless utf-8 is specified.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@john-bodley I removed the str(). six.text_type makes sense now.

else:
x = str(x)
x = str(x.encode('utf8'))
values.append({
'x': x,
'y': v,
Expand Down