2 files changed, 10 insertions, 10 deletions
diff --git a/mediagoblin/plugins/piwigo/tools.py b/mediagoblin/plugins/piwigo/tools.py
index 7b9b7af3..7b3e931a 100644
--- a/mediagoblin/plugins/piwigo/tools.py
+++ b/mediagoblin/plugins/piwigo/tools.py
@@ -47,9 +47,9 @@ class PwgNamedArray(list):
 
 
 def _fill_element_dict(el, data, as_attr=()):
-    for k, v in six.iteritems(data):
+    for k, v in data.items():
         if k in as_attr:
-            if not isinstance(v, six.string_types):
+            if not isinstance(v, str):
                 v = str(v)
             el.set(k, v)
         else:
@@ -63,7 +63,7 @@ def _fill_element(el, data):
             el.text = "1"
         else:
             el.text = "0"
-    elif isinstance(data, six.string_types):
+    elif isinstance(data, str):
         el.text = data
     elif isinstance(data, int):
         el.text = str(data)
@@ -92,7 +92,7 @@ def response_xml(result):
                     mimetype='text/xml', status=status)
 
 
-class CmdTable(object):
+class CmdTable:
     _cmd_table = {}
 
     def __init__(self, cmd_name, only_post=False):
@@ -131,11 +131,11 @@ def check_form(form):
         raise BadRequest()
     dump = []
     for f in form:
-        dump.append("%s=%r" % (f.name, f.data))
+        dump.append("{}={!r}".format(f.name, f.data))
     _log.debug("form: %s", " ".join(dump))
 
 
-class PWGSession(object):
+class PWGSession:
     session_manager = None
 
     def __init__(self, request):
diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py
index 30c7ffa2..ecc7054e 100644
--- a/mediagoblin/plugins/piwigo/views.py
+++ b/mediagoblin/plugins/piwigo/views.py
@@ -121,7 +121,7 @@ def pwg_images_addSimple(request):
         raise BadRequest()
     dump = []
     for f in form:
-        dump.append("%s=%r" % (f.name, f.data))
+        dump.append("{}={!r}".format(f.name, f.data))
     _log.info("addSimple: %r %s %r", request.form, " ".join(dump),
               request.files)
 
@@ -133,8 +133,8 @@ def pwg_images_addSimple(request):
             mg_app=request.app, user=request.user,
             submitted_file=request.files['image'],
             filename=request.files['image'].filename,
-            title=six.text_type(form.name.data),
-            description=six.text_type(form.comment.data))
+            title=str(form.name.data),
+            description=str(form.comment.data))
 
         collection_id = form.category.data
         if collection_id > 0:
@@ -151,7 +151,7 @@ def pwg_images_addSimple(request):
     # Handle upload limit issues
     except FileUploadLimit:
         raise BadRequest(
-            _(u'Sorry, the file size is too big.'))
+            _('Sorry, the file size is too big.'))
     except UserUploadLimit:
         raise BadRequest(
             _('Sorry, uploading this file will put you over your'