github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 08:17:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Middleware: Replace pylons.Response with raw WSGI.

Browse Source 
pylons.Response is deprecated and we're not really using its
capabilities here anyway.
This commit is contained in:
Neil Williams
2013-01-03 22:30:03 -08:00
parent 83f424c8d9
commit 44f42ef738
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
r2/r2/config/middleware.py
View File

@@ -31,7 +31,7 @@ from paste.cascade import Cascade
from paste.registry import RegistryManager
from paste.urlparser import StaticURLParser
from paste.deploy.converters import asbool
from pylons import config, Response
from pylons import config
from pylons.error import error_template
from pylons.middleware import ErrorDocuments, ErrorHandler, StaticJavascripts
from pylons.wsgiapp import PylonsApp, PylonsBaseWSGIApp
@@ -179,17 +179,15 @@ class DomainMiddleware(object):
# if there was a subreddit subdomain, redirect
if sr_redirect and environ.get("FULLPATH"):
r = Response()
if not subdomains and g.domain_prefix:
subdomains.append(g.domain_prefix)
subdomains.append(g.domain)
redir = "%s/r/%s/%s" % ('.'.join(subdomains),
sr_redirect, environ['FULLPATH'])
redir = "http://" + redir.replace('//', '/')
r.status_code = 301
r.headers['location'] = redir
r.content = ""
return r(environ, start_response)
start_response("301 Moved Permanently", [("Location", redir)])
return [""]
return self.app(environ, start_response)
@@ -304,34 +302,28 @@ class LimitUploadSize(object):
cl_key = 'CONTENT_LENGTH'
if environ['REQUEST_METHOD'] == 'POST':
if cl_key not in environ:
r = Response()
r.status_code = 411
r.content = '<html><head></head><body>length required</body></html>'
return r(environ, start_response)
start_response("411 Length Required", [])
return ['<html><body>length required</body></html>']
try:
cl_int = int(environ[cl_key])
except ValueError:
r = Response()
r.status_code = 400
r.content = '<html><head></head><body>bad request</body></html>'
return r(environ, start_response)
start_response("400 Bad Request", [])
return ['<html><body>bad request</body></html>']
if cl_int > self.max_size:
from r2.lib.strings import string_dict
error_msg = string_dict['css_validator_messages']['max_size'] % dict(max_size = self.max_size/1024)
r = Response()
r.status_code = 413
r.content = ("<html>"
"<head>"
"<script type='text/javascript'>"
"parent.completedUploadImage('failed',"
"'',"
"'',"
"[['BAD_CSS_NAME', ''], ['IMAGE_ERROR', '", error_msg,"']],"
"'image-upload');"
"</script></head><body>you shouldn\'t be here</body></html>")
return r(environ, start_response)
start_response("413 Too Big", [])
return ["<html>"
"<head>"
"<script type='text/javascript'>"
"parent.completedUploadImage('failed',"
"'',"
"'',"
"[['BAD_CSS_NAME', ''], ['IMAGE_ERROR', '", error_msg,"']],"
"'image-upload');"
"</script></head><body>you shouldn\'t be here</body></html>"]
return self.app(environ, start_response)