Skip to content

Toward Python 3 compatibility #16

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

Open
p wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Toward Python 3 compatibility #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51e3e3a
Python 3 compatible except syntax
p Jan 14, 2013
d467077
Python 3 compatible print syntax
p Jan 14, 2013
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
16 changes: 8 additions & 8 deletions itty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def convert_to_ascii(self, data):
if isinstance(data, unicode):
try:
return data.encode('us-ascii')
except UnicodeError, e:
except UnicodeError as e:
raise
else:
return str(data)
Expand All @@ -271,13 +271,13 @@ def handle_request(environ, start_response):
"""The main handler. Dispatches to the user's code."""
try:
request = Request(environ, start_response)
except Exception, e:
except Exception as e:
return handle_error(e)

try:
(re_url, url, callback), kwargs = find_matching_url(request)
response = callback(request, **kwargs)
except Exception, e:
except Exception as e:
return handle_error(e, request)

if not isinstance(response, Response):
Expand Down Expand Up @@ -616,12 +616,12 @@ def run_itty(server='wsgiref', host='localhost', port=8080, config=None):

# AppEngine seems to echo everything, even though it shouldn't. Accomodate.
if server != 'appengine':
print 'itty starting up (using %s)...' % server
print 'Listening on http://%s:%s...' % (host, port)
print 'Use Ctrl-C to quit.'
print
print('itty starting up (using %s)...' % server)
print('Listening on http://%s:%s...' % (host, port))
print('Use Ctrl-C to quit.')
print()

try:
WSGI_ADAPTERS[server](host, port)
except KeyboardInterrupt:
print 'Shutting down. Have a nice day!'
print('Shutting down. Have a nice day!')