From df1431cb1b62a93e6306725de4b303375c3044ae Mon Sep 17 00:00:00 2001 From: aodag Date: Wed, 9 Mar 2016 00:09:25 +0900 Subject: fix paste_deploy paster template for python3 --- .../paste_deploy/+package+/sampleapp.py_tmpl | 14 +++++++------- .../paste_deploy/+package+/wsgiapp.py_tmpl | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl b/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl index cb49352..5514cfc 100644 --- a/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl +++ b/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl @@ -10,14 +10,14 @@ def application(environ, start_response): start_response('200 OK', [('Content-type', 'text/html')]) greeting = CONFIG['greeting'] content = [ - '%s\n' % greeting, - '

%s!

\n' % greeting, - '\n', + b'%s\n' % greeting.encode('utf-8'), + b'

%s!

\n' % greeting.encode('utf-8'), + b'

\n', ] items = environ.items() - items.sort() + items = sorted(items) for key, value in items: - content.append('\n' - % (key, cgi.escape(repr(value)))) - content.append('

') + content.append(b'%s%s\n' + % (key.encode('utf-8'), cgi.escape(repr(value)).encode('utf-8'))) + content.append(b'') return content diff --git a/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl b/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl index 97decb8..5684c31 100644 --- a/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl +++ b/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl @@ -1,6 +1,7 @@ +from __future__ import absolute_import from paste.deploy.config import ConfigMiddleware -import sampleapp +from . import sampleapp def make_app( -- cgit v1.2.1