diff options
| author | ianb <devnull@localhost> | 2006-01-10 09:10:23 +0000 |
|---|---|---|
| committer | ianb <devnull@localhost> | 2006-01-10 09:10:23 +0000 |
| commit | 90e478a3104acb5a4c6debddbdbbc53f0961ff7e (patch) | |
| tree | 191a4a446d756656c35ca03fa272b98772ee46ff /paste/deploy | |
| parent | a7b194752142c6d78553ba4ed23c664e0012a91e (diff) | |
| download | pastedeploy-90e478a3104acb5a4c6debddbdbbc53f0961ff7e.tar.gz | |
Removed python2.4isms
Diffstat (limited to 'paste/deploy')
| -rw-r--r-- | paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl | 6 | ||||
| -rw-r--r-- | paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl | 2 |
2 files changed, 5 insertions, 3 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 4db7d13..ae55f97 100644 --- a/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl +++ b/paste/deploy/paster_templates/paste_deploy/+package+/sampleapp.py_tmpl @@ -12,9 +12,11 @@ def application(environ, start_response): '<body><h1>%s!</h1>\n' % greeting, '<table border=1>\n', ] - for key in sorted(environ): + items = environ.items() + items.sort() + for key, value in items: content.append('<tr><td>%s</td><td>%s</td></tr>\n' - % (key, cgi.escape(repr(environ[key])))) + % (key, cgi.escape(repr(value)))) content.append('</table></body></html>') 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 5d7bced..57155fc 100644 --- a/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl +++ b/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl @@ -13,7 +13,7 @@ def make_app( # dictionary; you don't have to do this, but this # can be convenient later to add ad hoc configuration: conf = global_conf.copy() - conf.update(**kw) + conf.update(kw) conf['greeting'] = greeting # ConfigMiddleware means that paste.deploy.CONFIG will, # during this request (threadsafe) represent the |