Use pyupgrade to remove old Python syntax

Author: vdboor

src/fluentdemo/apps/blog/forms.py

@@ -7,7 +7,7 @@ class CommentForm(CompactLabelsCommentForm):
     """
 
     def __init__(self, *args, **kwargs):
-        super(CommentForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # Fix translations of the labels
         self.fields['url'].label = "Website"

src/fluentdemo/apps/blog/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import slug_preview.models
 import taggit_selectize.managers

src/fluentdemo/apps/sentry/versioning.py

@@ -16,9 +16,9 @@ def fetch_git_sha(path, head=None):
         head_path = os.path.join(path, '.git', 'HEAD')
         if not os.path.exists(head_path):
             raise InvalidGitRepository(
-                'Cannot identify HEAD for git repository at %s' % (path,))
+                f'Cannot identify HEAD for git repository at {path}')
 
-        with open(head_path, 'r') as fp:
+        with open(head_path) as fp:
             head = str(fp.read()).strip()
 
         if head.startswith('ref: '):
@@ -34,7 +34,7 @@ def fetch_git_sha(path, head=None):
     if not os.path.exists(revision_file):
         if not os.path.exists(os.path.join(path, '.git')):
             raise InvalidGitRepository(
-                '%s does not seem to be the root of a git repository' % (path,))
+                f'{path} does not seem to be the root of a git repository')
 
         # Check for our .git/packed-refs' file since a `git gc` may have run
         # https://git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery
@@ -52,7 +52,7 @@ def fetch_git_sha(path, head=None):
                             return str(revision)
 
         raise InvalidGitRepository(
-            'Unable to find ref to head "%s" in repository' % (head,))
+            f'Unable to find ref to head "{head}" in repository')
 
     with open(revision_file) as fh:
         return str(fh.read()).strip()

src/fluentdemo/settings/defaults.py

@@ -247,10 +247,10 @@
     'disable_existing_loggers': False,
     'formatters': {
         'verbose': {
-            'format': u'%(levelname)s: %(asctime)s %(process)d %(thread)d %(module)s: %(message)s',
+            'format': '%(levelname)s: %(asctime)s %(process)d %(thread)d %(module)s: %(message)s',
         },
         'simple': {
-            'format': u'%(levelname)s:\t%(message)s',
+            'format': '%(levelname)s:\t%(message)s',
         },
     },
     'filters': {
@@ -313,7 +313,7 @@
     'Document': ['.pdf', '.doc', '.xls', '.csv', '.docx', '.xlsx'],
     'Video': ['.swf', '.mp4', '.flv', '.f4v', '.mov', '.3gp'],
 }
-FILEBROWSER_EXCLUDE = ('cache', '_versions', '_admin_thumbnail\.', '_big\.', '_large\.', '_medium\.', '_small\.', '_thumbnail\.')
+FILEBROWSER_EXCLUDE = ('cache', '_versions', r'_admin_thumbnail\.', r'_big\.', r'_large\.', r'_medium\.', r'_small\.', r'_thumbnail\.')
 FILEBROWSER_MAX_UPLOAD_SIZE = 100 * 1024 * 1024  # in bytes
 FILEBROWSER_STRICT_PIL = True
 FILEBROWSER_ADMIN_VERSIONS = [

src/fluentdemo/settings/docker.py

@@ -10,7 +10,7 @@
 try:
     with open(SRC_DIR + '/.docker-git-version') as f:
         GIT_VERSION = f.read().strip()
-except IOError:
+except OSError:
     pass
 
 SILENCED_SYSTEM_CHECKS = (

src/frontend/context_processors.py

@@ -11,5 +11,5 @@ def frontend(request):
 
     return {
         'site': site,
-        'site_root': SimpleLazyObject(lambda: "{0}{1}".format(http_scheme, site.domain)),
+        'site_root': SimpleLazyObject(lambda: f"{http_scheme}{site.domain}"),
     }