syntax sugar: files upload syntax

Author: Tom Willis

tests/test_quickstart.py

@@ -228,6 +228,7 @@ def testUploadFiles(self):
         self.assert_("audio/mpeg" in req.body, l.PRINT_REQ(req))
         print l.PRINT_REQ(req)
 
+
     def testLogReqRes(self):
         IMG = b"\xff\xab"
         msg = l.PRINT_REQ(Request.blank("/", body=IMG, method="POST"))
@@ -286,6 +287,20 @@ def echo(environ, start_response):
         d.add("b", u"Nike %s" % TM)
         tc.get("/", query_string=d)
 
+    def testFiles(self):
+        def echo(environ, start_response):
+            r = Request(environ)
+            return Response(r.body)(environ, start_response)
+        tc = testing.TestClient(pipeline=echo)
+        res = tc.post("/", files=dict(file1=("this.mp3", "i am music")))
+        self.assertIn("this.mp3", res.body)
+
+        with self.assertRaises(KeyError):
+            tc.post("/", post=dict(file1="xxx"), 
+                    files=dict(file1=("this.mp3", "i am music")))
+
+        with self.assertRaises(ValueError):
+            res = tc.post("/", files=dict(file1=("this.mp3")))            
 
 
 class TestHoles(unittest.TestCase):

webobtoolkit/client.py

@@ -55,7 +55,7 @@ class Client(object):
     """
 
     def __init__(self, pipeline=None, assert_=None):
-        self._pipeline = pipeline or client_app
+        self._pipeline = pipeline or client_pipeline()
         if assert_:
             self._assert_ = assert_
         else:
@@ -110,7 +110,7 @@ def head(self, url, query_string=None, headers={}, assert_=None):
                     headers=headers,
                     assert_=assert_)
 
-    def post(self, url, query_string=None, post={}, headers={}, assert_=None):
+    def post(self, url, query_string=None, post={}, headers={}, assert_=None, files={}):
         """
         make an HTTP POST Request and return the response
 
@@ -130,6 +130,16 @@ def post(self, url, query_string=None, post={}, headers={}, assert_=None):
         present it will be ran for this call only rather than the one
         set on the client
         """
+        for k, v in files.items():
+            try:
+                filename, filevalue = v
+            except ValueError:
+                raise ValueError("files needs to contain 2 item sequences of (filename, filebody) %s" % v)
+
+            if k not in post:
+                post[k] = (filename, filevalue)
+            else:
+                raise KeyError("%s already exists in post" % k)
 
         return self(url=url,
                     method="POST",

webobtoolkit/testing.py

@@ -10,7 +10,7 @@
 """
 from constants import STATUS_CODES
 from log import PRINT_REQ, PRINT_RES
-from client import Client, client_app
+from client import Client, client_pipeline
 from filters import auto_redirect_filter
 
 
@@ -53,7 +53,7 @@ class TestClient(Client):
     basically if anything other than 302 or 200 will result in a failure
     """
     def __init__(self, pipeline=None, redirect=False):
-        app = pipeline or client_app
+        app = pipeline or client_pipeline()
         if redirect:
             app = auto_redirect_filter(app)
         else:
@@ -71,8 +71,8 @@ def head(self, url, query_string=None, headers={}, status=None):
         kw["assert_"] = get_assert(status)
         return Client.head(self, url, **kw)
 
-    def post(self, url, query_string=None, post={}, headers={}, status=None):
-        kw = dict(query_string=query_string, headers=headers, post=post)
+    def post(self, url, query_string=None, post={}, headers={}, files={}, status=None):
+        kw = dict(query_string=query_string, headers=headers, post=post, files=files)
         kw["assert_"] = get_assert(status)
         return Client.post(self, url, **kw)