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

2 files changed, 15 insertions, 15 deletions

diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
index ae6fadf6..0312cc8f 100644
--- a/mediagoblin/auth/tools.py
+++ b/mediagoblin/auth/tools.py
@@ -47,12 +47,12 @@ def normalize_user_or_email_field(allow_email=True, allow_user=True,
         If is_login is True, does not check the length of username.
 
     """
-    message = _(u'Invalid User name or email address.')
-    nomail_msg = _(u"This field does not take email addresses.")
-    nouser_msg = _(u"This field requires an email address.")
+    message = _('Invalid User name or email address.')
+    nomail_msg = _("This field does not take email addresses.")
+    nouser_msg = _("This field requires an email address.")
 
     def _normalize_field(form, field):
-        email = u'@' in field.data
+        email = '@' in field.data
         if email:  # normalize email address casing
             if not allow_email:
                 raise wtforms.ValidationError(nomail_msg)
@@ -71,8 +71,8 @@ def normalize_user_or_email_field(allow_email=True, allow_user=True,
 
 
 EMAIL_VERIFICATION_TEMPLATE = (
-    u"{uri}?"
-    u"token={verification_key}")
+    "{uri}?"
+    "token={verification_key}")
 
 
 def send_verification_email(user, request, email=None,
@@ -121,11 +121,11 @@ def basic_extra_validation(register_form, *args):
 
     if users_with_username:
         register_form.username.errors.append(
-            _(u'Sorry, a user with that name already exists.'))
+            _('Sorry, a user with that name already exists.'))
         extra_validation_passes = False
     if users_with_email:
         register_form.email.errors.append(
-            _(u'Sorry, a user with that email address already exists.'))
+            _('Sorry, a user with that email address already exists.'))
         extra_validation_passes = False
 
     return extra_validation_passes
@@ -144,7 +144,7 @@ def register_user(request, register_form):
         user.save()
 
         # log the user in
-        request.session['user_id'] = six.text_type(user.id)
+        request.session['user_id'] = str(user.id)
         request.session.save()
 
         # send verification email
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 593d588d..08228d1b 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -45,7 +45,7 @@ def register(request):
     if 'pass_auth' not in request.template_env.globals:
         redirect_name = hook_handle('auth_no_pass_redirect')
         if redirect_name:
-            return redirect(request, 'mediagoblin.plugins.{0}.register'.format(
+            return redirect(request, 'mediagoblin.plugins.{}.register'.format(
                 redirect_name))
         else:
             return redirect(request, 'index')
@@ -80,7 +80,7 @@ def login(request):
     if 'pass_auth' not in request.template_env.globals:
         redirect_name = hook_handle('auth_no_pass_redirect')
         if redirect_name:
-            return redirect(request, 'mediagoblin.plugins.{0}.login'.format(
+            return redirect(request, 'mediagoblin.plugins.{}.login'.format(
                 redirect_name))
         else:
             return redirect(request, 'index')
@@ -100,7 +100,7 @@ def login(request):
                 # set up login in session
                 if login_form.stay_logged_in.data:
                     request.session['stay_logged_in'] = True
-                request.session['user_id'] = six.text_type(user.id)
+                request.session['user_id'] = str(user.id)
                 request.session.save()
 
                 if request.form.get('next'):
@@ -157,11 +157,11 @@ def verify_email(request):
 
     user = User.query.filter_by(id=int(token)).first()
 
-    if user and user.has_privilege(u'active') is False:
+    if user and user.has_privilege('active') is False:
         user.verification_key = None
         user.all_privileges.append(
             Privilege.query.filter(
-            Privilege.privilege_name==u'active').first())
+            Privilege.privilege_name=='active').first())
 
         user.save()
 
@@ -196,7 +196,7 @@ def resend_activation(request):
 
         return redirect(request, 'mediagoblin.auth.login')
 
-    if request.user.has_privilege(u'active'):
+    if request.user.has_privilege('active'):
         messages.add_message(
             request,
             messages.ERROR,