Skip to content

Python3 fixes for Tornado #649

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
omab merged 2 commits into from
Jul 9, 2015
Merged

Python3 fixes for Tornado #649

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
b567c0e
Python3 fixes for Tornado
MaartenKos Jun 17, 2015
35a48be
Fix decoding of request args
MaartenKos Jul 3, 2015
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
2 changes: 1 addition & 1 deletion social/apps/tornado_app/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from tornado.web import url

from handlers import AuthHandler, CompleteHandler, DisconnectHandler
from .handlers import AuthHandler, CompleteHandler, DisconnectHandler


SOCIAL_AUTH_ROUTES = [
Expand Down
5 changes: 3 additions & 2 deletions social/strategies/tornado_strategy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import json
import six

from tornado.template import Loader, Template

Expand Down Expand Up @@ -28,8 +29,8 @@ def get_setting(self, name):

def request_data(self, merge=True):
# Multiple valued arguments not supported yet
return dict((key, val[0])
for key, val in self.request.arguments.iteritems())
return dict((key, val[0].decode())
for key, val in six.iteritems(self.request.arguments))

def request_host(self):
return self.request.host
Expand Down