jespern / django-piston / changeset / ac9c7fe24cc4

Up to file-list piston/utils.py:

@@ -217,15 +217,15 @@ class Mimer(object):
         if not self.is_multipart() and ctype:
             loadee = self.loader_for_type(ctype)
             if loadee:
                 try:
-                    self.request.data = loadee(self.request.raw_post_data)
+            try:
                 self.request.data = loadee(self.request.raw_post_data)
                     # Reset both POST and PUT from request, as its
                     # misleading having their presence around.
                     self.request.POST = self.request.PUT = dict()
                 except (TypeError, ValueError):
-                    raise MimerDataException
+                # Reset both POST and PUT from request, as its
                 # misleading having their presence around.
                 self.request.POST = self.request.PUT = dict()
             except (TypeError, ValueError):
                 # This also catches if loadee is None.
                 raise MimerDataException
         return self.request

Up to file-list tests/test_project/apps/testapp/handlers.py:

@@ -38,7 +38,7 @@ class ExpressiveHandler(BaseHandler):
         return inst
     def create(self, request):
-        if request.content_type:
+        if request.content_type and request.data:
             data = request.data
             em = self.model(title=data['title'], content=data['content'])
@@ -49,7 +49,7 @@ class ExpressiveHandler(BaseHandler):
             return rc.CREATED
         else:
-            super(ExpressiveTestModel, self).create(request)
+            super(ExpressiveHandler, self).create(request)
 class AbstractHandler(BaseHandler):
     fields = ('id', 'some_other', 'some_field')

Up to file-list tests/test_project/apps/testapp/tests.py:

@@ -88,17 +88,19 @@ class OAuthTests(MainTests):
         # Response should be a redirect...
         self.assertEqual(302, response.status_code)
-        self.assertEqual('http://printer.example.com/request_token_ready?oauth_token='+oatoken.key, response['Location'])
+        self.failUnless(response['Location'].startswith("http://printer.example.com/request_token_ready?"))
         self.failUnless(('oauth_token='+oatoken.key in response['Location']))
         # Actually we can't test this last part, since it's 1.0a.
         # Obtain access token...
 #        request = oauth.OAuthRequest.from_consumer_and_token(oaconsumer, token=oatoken,
 #                http_url='http://testserver/api/oauth/access_token')
 #        request.sign_request(self.signature_method, oaconsumer, oatoken)
 #        response = self.client.get('/api/oauth/access_token', request.parameters)
         # Obtain access token...
         request = oauth.OAuthRequest.from_consumer_and_token(oaconsumer, token=oatoken,
                 http_url='http://testserver/api/oauth/access_token')
         request.sign_request(self.signature_method, oaconsumer, oatoken)
         response = self.client.get('/api/oauth/access_token', request.parameters)
         oa_atoken = oauth.OAuthToken.from_string(response.content)
         atoken = Token.objects.get(key=oa_atoken.key, token_type=Token.ACCESS)
-        self.assertEqual(atoken.secret, oa_atoken.secret)
+#        oa_atoken = oauth.OAuthToken.from_string(response.content)
 #        atoken = Token.objects.get(key=oa_atoken.key, token_type=Token.ACCESS)
 #        self.assertEqual(atoken.secret, oa_atoken.secret)
 class BasicAuthTest(MainTests):

commit 211:	ac9c7fe24cc4
parent 210:	1b139755d6f9
branch:	default

jespern / django-piston (http://bitbucket.org/jespern/)