david / django-roa / changeset / 215dfcbb7882

Up to file-list piston/emitters.py:

@@ -402,7 +402,7 @@ class YAMLEmitter(Emitter):
 if yaml:  # Only register yaml if it was import successfully.
     Emitter.register('yaml', YAMLEmitter, 'application/x-yaml; charset=utf-8')
-    Mimer.register(yaml.load, ('application/x-yaml',))
+    Mimer.register(lambda s: dict(yaml.load(s)), ('application/x-yaml',))
 class PickleEmitter(Emitter):
     """
@@ -412,7 +412,17 @@ class PickleEmitter(Emitter):
         return pickle.dumps(self.construct())
 Emitter.register('pickle', PickleEmitter, 'application/python-pickle')
 Mimer.register(pickle.loads, ('application/python-pickle',))
 """
 WARNING: Accepting arbitrary pickled data is a huge security concern.
 The unpickler has been disabled by default now, and if you want to use
 it, please be aware of what implications it will have.
 Read more: http://nadiana.com/python-pickle-insecure
 Uncomment the line below to enable it. You're doing so at your own risk.
 """
 # Mimer.register(pickle.loads, ('application/python-pickle',))
 class DjangoEmitter(Emitter):
     """

Up to file-list piston/utils.py:

@@ -179,7 +179,7 @@ class Mimer(object):
             for mime in mimes:
                 if ctype.startswith(mime):
                     return loadee
     def content_type(self):
         """
         Returns the content type of the request in all cases where it is
@@ -193,7 +193,6 @@ class Mimer(object):
             return None
         return ctype
     def translate(self):
         """
@@ -214,15 +213,18 @@ class Mimer(object):
         if not self.is_multipart() and ctype:
             loadee = self.loader_for_type(ctype)
             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):
                 # This also catches if loadee is None.
-                raise MimerDataException
+            if loadee:
                 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):
                     # This also catches if loadee is None.
                     raise MimerDataException
             else:
                 self.request.data = None
         return self.request
@@ -298,12 +300,13 @@ def send_consumer_mail(consumer):
     except AttributeError:
         sender = settings.DEFAULT_FROM_EMAIL
-    send_mail(_(subject), body, sender, [consumer.user.email], fail_silently=True)
+    if consumer.user:
         send_mail(_(subject), body, sender, [consumer.user.email], fail_silently=True)
     if consumer.status == 'pending' and len(settings.ADMINS):
         mail_admins(_(subject), body, fail_silently=True)
-    if settings.DEBUG:
+    if settings.DEBUG and consumer.user:
         print "Mail being sent, to=%s" % consumer.user.email
         print "Subject: %s" % _(subject)
         print body

commit 135:	215dfcbb7882
parent 134:	abc332ad5029
branch:	default

david / django-roa (http://welldev.org/)