2 files changed, 9 insertions, 5 deletions
diff --git a/mediagoblin/plugins/piwigo/tools.py b/mediagoblin/plugins/piwigo/tools.py
index 85d77310..4d2e985a 100644
--- a/mediagoblin/plugins/piwigo/tools.py
+++ b/mediagoblin/plugins/piwigo/tools.py
@@ -16,6 +16,7 @@
 
 import logging
 
+import six
 import lxml.etree as ET
 from werkzeug.exceptions import MethodNotAllowed
 
@@ -43,7 +44,7 @@ class PwgNamedArray(list):
 def _fill_element_dict(el, data, as_attr=()):
     for k, v in data.iteritems():
         if k in as_attr:
-            if not isinstance(v, basestring):
+            if not isinstance(v, six.string_types):
                 v = str(v)
             el.set(k, v)
         else:
@@ -57,7 +58,7 @@ def _fill_element(el, data):
             el.text = "1"
         else:
             el.text = "0"
-    elif isinstance(data, basestring):
+    elif isinstance(data, six.string_types):
         el.text = data
     elif isinstance(data, int):
         el.text = str(data)
diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py
index 3dee09cd..bd3f9320 100644
--- a/mediagoblin/plugins/piwigo/views.py
+++ b/mediagoblin/plugins/piwigo/views.py
@@ -17,12 +17,12 @@
 import logging
 import re
 
-from werkzeug.exceptions import MethodNotAllowed, BadRequest
+from werkzeug.exceptions import MethodNotAllowed, BadRequest, NotImplemented
 from werkzeug.wrappers import BaseResponse
 
 from mediagoblin import mg_globals
 from mediagoblin.meddleware.csrf import csrf_exempt
-from mediagoblin.tools.response import render_404
+from mediagoblin.submit.lib import check_file_field
 from .tools import CmdTable, PwgNamedArray, response_xml
 from .forms import AddSimpleForm
 
@@ -92,6 +92,9 @@ def pwg_images_addSimple(request):
         dump.append("%s=%r" % (f.name, f.data))
     _log.info("addimple: %r %s %r", request.form, " ".join(dump), request.files)
 
+    if not check_file_field(request, 'image'):
+        raise BadRequest()
+
     return {'image_id': 123456, 'url': ''}
 
                 
@@ -153,7 +156,7 @@ def ws_php(request):
     if not func:
         _log.warn("wsphp: Unhandled %s %r %r", request.method,
                   request.args, request.form)
-        return render_404(request)
+        raise NotImplemented()
 
     result = func(request)