Apply `pyupgrade --py3-plus` to remove Python 2 compatibility code.

3 files changed, 15 insertions, 15 deletions

diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index 69d211e6..ac605c73 100644
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -27,7 +27,7 @@ def get_submit_start_form(form, **kwargs):
     max_file_size = kwargs.get('max_file_size')
     desc = None
     if max_file_size:
-        desc = _('Max file size: {0} mb'.format(max_file_size))
+        desc = _('Max file size: {} mb'.format(max_file_size))
 
     class SubmitStartForm(wtforms.Form):
         file = wtforms.FileField(
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index 9ec96923..ad08e14f 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -105,7 +105,7 @@ class UserPastUploadLimit(UploadLimitError):
 
 def submit_media(mg_app, user, submitted_file, filename,
                  title=None, description=None, collection_slug=None,
-                 license=None, metadata=None, tags_string=u"",
+                 license=None, metadata=None, tags_string="",
                  callback_url=None, urlgen=None,):
     """
     Args:
@@ -132,7 +132,7 @@ def submit_media(mg_app, user, submitted_file, filename,
 
     # If the filename contains non ascii generate a unique name
     if not all(ord(c) < 128 for c in filename):
-        filename = six.text_type(uuid.uuid4()) + splitext(filename)[-1]
+        filename = str(uuid.uuid4()) + splitext(filename)[-1]
 
     # Sniff the submitted media to determine which
     # media plugin should handle processing
@@ -141,9 +141,9 @@ def submit_media(mg_app, user, submitted_file, filename,
     # create entry and save in database
     entry = new_upload_entry(user)
     entry.media_type = media_type
-    entry.title = (title or six.text_type(splitext(filename)[0]))
+    entry.title = (title or str(splitext(filename)[0]))
 
-    entry.description = description or u""
+    entry.description = description or ""
 
     entry.license = license or None
 
@@ -163,7 +163,7 @@ def submit_media(mg_app, user, submitted_file, filename,
     # Get file size and round to 2 decimal places
     file_size = mg_app.queue_store.get_file_size(
         entry.queued_media_file) / (1024.0 * 1024)
-    file_size = float('{0:.2f}'.format(file_size))
+    file_size = float('{:.2f}'.format(file_size))
 
     # Check if file size is over the limit
     if max_file_size and file_size >= max_file_size:
@@ -233,7 +233,7 @@ def prepare_queue_task(app, entry, filename):
     # (If we got it off the task's auto-generation, there'd be
     # a risk of a race condition when we'd save after sending
     # off the task)
-    task_id = six.text_type(uuid.uuid4())
+    task_id = str(uuid.uuid4())
     entry.queued_task_id = task_id
 
     # Now store generate the queueing related filename
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 7bbfb645..db7ad82a 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -37,7 +37,7 @@ from mediagoblin.user_pages.lib import add_media_to_collection
 
 
 @require_active_login
-@user_has_privilege(u'uploader')
+@user_has_privilege('uploader')
 def submit_start(request):
     """
     First view for submitting a file.
@@ -65,16 +65,16 @@ def submit_start(request):
     if request.method == 'POST' and submit_form.validate():
         if not check_file_field(request, 'file'):
             submit_form.file.errors.append(
-                _(u'You must provide a file.'))
+                _('You must provide a file.'))
         else:
             try:
                 media = submit_media(
                     mg_app=request.app, user=request.user,
                     submitted_file=request.files['file'],
                     filename=request.files['file'].filename,
-                    title=six.text_type(submit_form.title.data),
-                    description=six.text_type(submit_form.description.data),
-                    license=six.text_type(submit_form.license.data) or None,
+                    title=str(submit_form.title.data),
+                    description=str(submit_form.description.data),
+                    license=str(submit_form.license.data) or None,
                     tags_string=submit_form.tags.data,
                     urlgen=request.urlgen)
 
@@ -97,7 +97,7 @@ def submit_start(request):
             # Handle upload limit issues
             except FileUploadLimit:
                 submit_form.file.errors.append(
-                    _(u'Sorry, the file size is too big.'))
+                    _('Sorry, the file size is too big.'))
             except UserUploadLimit:
                 submit_form.file.errors.append(
                     _('Sorry, uploading this file will put you over your'
@@ -131,8 +131,8 @@ def add_collection(request, media=None):
     if request.method == 'POST' and submit_form.validate():
         collection = request.db.Collection()
 
-        collection.title = six.text_type(submit_form.title.data)
-        collection.description = six.text_type(submit_form.description.data)
+        collection.title = str(submit_form.title.data)
+        collection.description = str(submit_form.description.data)
         collection.actor = request.user.id
         collection.type = request.db.Collection.USER_DEFINED_TYPE
         collection.generate_slug()