fix str(Response()) w/o charset, but only on py2

.gitignore

@@ -20,3 +20,5 @@ Session.vim
 coverage.xml
 nosetests.xml
 env32/
+
+_website/

tests/test_in_wsgiref.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import sys
 import logging
 import threading

tests/test_response.py

@@ -342,6 +342,8 @@ def test_from_file():
     res = Response('test')
     inp = io.BytesIO(bytes_(str(res)))
     equal_resp(res, inp)
+
+def test_from_file2():
     res = Response(app_iter=iter([b'test ', b'body']),
                     content_type='text/plain')
     inp = io.BytesIO(bytes_(str(res)))

webob/response.py

@@ -214,10 +214,9 @@ def __str__(self, skip_body=False):
             self.body
         parts += map('%s: %s'.__mod__, self.headerlist)
         if not skip_body and self.body:
-            parts += ['', self.text]
+            parts += ['', self.text if PY3 else self.body]
         return '\n'.join(parts)
 
-
     #
     # status, status_int
     #