bug fix in application.request

Author: anandology

test/application.py

@@ -190,17 +190,20 @@ def g():
 
  def testUnicodeInput(self):
  urls = (
- "/.*", "foo"
+ "(/.*)", "foo"
  )
  class foo:
- def GET(self):
+ def GET(self, path):
  i = web.input(name='')
  return repr(i.name)
 
- def POST(self):
- return repr(web.data())
- i = web.input(name={})
- return repr(i)
+ def POST(self, path):
+ if path == '/multipart':
+ i = web.input(file={})
+ return i.file.value
+ else:
+ i = web.input()
+ return repr(dict(i))
 
  app = web.application(urls, locals())
 
@@ -210,11 +213,14 @@ def f(name):
 
  f(u'\u1234')
  f(u'foo')
+
+ response = app.request('/', method='POST', data=dict(name='foo'))
+ self.assertEquals(response.data, "{'name': u'foo'}")
 
- data = '--boundary\r\nContent-Disposition: form-data; name="name"; filename="a.txt"\r\nContent-Type: text/plain\r\n\r\na\r\n--boundary--\r\n'
- headers = {'Content-Type': 'multipart/form-data; boundary=--boundary'}
- response = app.request('/', method="POST", data=data, headers=headers)
- #self.assertEquals(response.data, 'a')
+ data = '--boundary\r\nContent-Disposition: form-data; name="x"\r\nfoo\r\n--boundary\r\nContent-Disposition: form-data; name="file"; filename="a.txt"\r\nContent-Type: text/plain\r\n\r\na\r\n--boundary--\r\n'
+ headers = {'Content-Type': 'multipart/form-data; boundary=boundary'}
+ response = app.request('/multipart', method="POST", data=data, headers=headers)
+ self.assertEquals(response.data, 'a')
 
  def testCustomNotFound(self):
  urls_a = ("/", "a")
@@ -242,6 +248,6 @@ def assert_notfound(path, message):
  app.notfound = lambda: web.HTTPError("404 Not Found", {}, "not found 2")
  assert_notfound("/a/foo", "not found 1")
  assert_notfound("/b/foo", "not found 2")
- 
+
 if __name__ == '__main__':
  webtest.main()

web/application.py

@@ -165,16 +165,25 @@ def request(self, localpart='/', method='GET', data=None,
  env = {}
  env = dict(env, HTTP_HOST=host, REQUEST_METHOD=method, PATH_INFO=path, QUERY_STRING=query, HTTPS=str(https))
  headers = headers or {}
+
  for k, v in headers.items():
  env['HTTP_' + k.upper().replace('-', '_')] = v
- 
+
+ if 'HTTP_CONTENT_LENGTH' in env:
+ env['CONTENT_LENGTH'] = env.pop('HTTP_CONTENT_LENGTH')
+
+ if 'HTTP_CONTENT_TYPE' in env:
+ env['CONTENT_TYPE'] = env.pop('HTTP_CONTENT_TYPE')
+
  if data:
  import StringIO
  if isinstance(data, dict):
  q = urllib.urlencode(data)
  else:
  q = data
  env['wsgi.input'] = StringIO.StringIO(q)
+ if not env.get('CONTENT_TYPE', '').lower().startswith('multipart/') and 'CONTENT_LENGTH' not in env:
+ env['CONTENT_LENGTH'] = len(q)
  response = web.storage()
  def start_response(status, headers):
  response.status = status