lint: Blacken all the code

String normalization is done in a separate commit, since it makes the
patch unreadable otherwise.

Author: pradyunsg

.pre-commit-config.yaml

@@ -30,3 +30,11 @@ repos:
   - id: isort
     additional_dependencies: [toml]
     files: \.py$
+
+- repo: https://github.com/psf/black
+  rev: stable
+  hooks:
+  - id: black
+    language_version: python3.6
+    args: [--skip-string-normalization]
+    exclude: .*/migrations/.*

docs/source/conf.py

@@ -44,7 +44,5 @@
 
 
 def setup(app):
-    app.add_config_value('recommonmark_config', {
-        'enable_auto_toc_tree': True,
-    }, True)
+    app.add_config_value('recommonmark_config', {'enable_auto_toc_tree': True,}, True)
     app.add_transform(AutoStructify)

junction/__init__.py

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 __version__ = '0.3.2'
-__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
+__version_info__ = tuple(
+    [
+        int(num) if num.isdigit() else num
+        for num in __version__.replace('-', '.', 1).split('.')
+    ]
+)
 
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.

junction/base/admin.py

@@ -16,12 +16,18 @@ def save_model(self, request, obj, form, change):
 
 
 class TimeAuditAdmin(admin.ModelAdmin):
-    list_display = ('created_at', 'modified_at',)
+    list_display = (
+        'created_at',
+        'modified_at',
+    )
 
 
 class AuditAdmin(TimeAuditAdmin):
     list_display = ('created_by', 'modified_by',) + TimeAuditAdmin.list_display
-    exclude = ('created_by', 'modified_by',)
+    exclude = (
+        'created_by',
+        'modified_by',
+    )
 
     def save_model(self, request, obj, form, change):
         save_model(self, request, obj, form, change)

junction/base/constants.py

@@ -6,8 +6,7 @@
 
 def _user_attributes(cls):
     defaults = dir(type(str('defaults'), (object,), {}))  # gives all inbuilt attrs
-    return [
-        item[0] for item in inspect.getmembers(cls) if item[0] not in defaults]
+    return [item[0] for item in inspect.getmembers(cls) if item[0] not in defaults]
 
 
 def choices(cls):
@@ -88,15 +87,20 @@ class ConferenceSettingConstants:
     ALLOW_PUBLIC_VOTING_ON_PROPOSALS = {
         "name": "allow_public_voting_on_proposals",
         "value": True,
-        "description": "Allow public to vote on proposals"}
+        "description": "Allow public to vote on proposals",
+    }
 
-    DISPLAY_PROPOSALS_IN_PUBLIC = {"name": "display_proposals_in_public",
-                                   "value": True,
-                                   "description": "Display proposals in public"}
+    DISPLAY_PROPOSALS_IN_PUBLIC = {
+        "name": "display_proposals_in_public",
+        "value": True,
+        "description": "Display proposals in public",
+    }
 
-    ALLOW_PLUS_ZERO_REVIEWER_VOTE = {"name": "allow_plus_zero_reviewer_vote",
-                                     "value": True,
-                                     "description": "Allow +0 vote in reviewer votes"}
+    ALLOW_PLUS_ZERO_REVIEWER_VOTE = {
+        "name": "allow_plus_zero_reviewer_vote",
+        "value": True,
+        "description": "Allow +0 vote in reviewer votes",
+    }
 
 
 @choices

junction/base/emailer.py

@@ -19,6 +19,7 @@ def send_email(to, context, template_dir):
     :rtype: None
 
     """
+
     def to_str(template_name):
         return render_to_string(path.join(template_dir, template_name), context).strip()
 
@@ -28,9 +29,14 @@ def to_str(template_name):
     from_email = settings.DEFAULT_FROM_EMAIL
     recipient_list = [_format_email(to)]
 
-    return send_mail(subject, text_message, from_email, recipient_list, html_message=html_message)
+    return send_mail(
+        subject, text_message, from_email, recipient_list, html_message=html_message
+    )
 
 
 def _format_email(user):
-    return user.email if user.first_name and user.last_name else \
-        '"{} {}" <{}>'.format(user.first_name, user.last_name, user.email)
+    return (
+        user.email
+        if user.first_name and user.last_name
+        else '"{} {}" <{}>'.format(user.first_name, user.last_name, user.email)
+    )

junction/base/models.py

@@ -8,6 +8,7 @@
 class TimeAuditModel(models.Model):
     """To track when the record was created and last modified
     """
+
     created_at = models.DateTimeField(auto_now_add=True, verbose_name="Created At")
     modified_at = models.DateTimeField(auto_now=True, verbose_name="Last Modified At")
 
@@ -18,16 +19,26 @@ class Meta:
 class UserAuditModel(models.Model):
     """ To track who created and last modified the record
     """
-    created_by = models.ForeignKey(User, related_name='created_%(class)s_set',
-                                   null=True, blank=True, verbose_name="Created By")
-    modified_by = models.ForeignKey(User, related_name='updated_%(class)s_set',
-                                    null=True, blank=True, verbose_name="Modified By")
+
+    created_by = models.ForeignKey(
+        User,
+        related_name='created_%(class)s_set',
+        null=True,
+        blank=True,
+        verbose_name="Created By",
+    )
+    modified_by = models.ForeignKey(
+        User,
+        related_name='updated_%(class)s_set',
+        null=True,
+        blank=True,
+        verbose_name="Modified By",
+    )
 
     class Meta:
         abstract = True
 
 
 class AuditModel(TimeAuditModel, UserAuditModel):
-
     class Meta:
         abstract = True

junction/base/monkey.py

@@ -37,8 +37,9 @@ def patch_urlresolvers():
     old_reverse = urlresolvers.reverse
 
     def new_reverse(viewname, urlconf=None, args=None, kwargs=None, current_app=None):
-        path = old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs,
-                           current_app=current_app)
+        path = old_reverse(
+            viewname, urlconf=urlconf, args=args, kwargs=kwargs, current_app=current_app
+        )
         if is_absolute_url(path):
             return path
 

junction/base/templatetags/date.py

@@ -15,7 +15,9 @@ def fromnow(value):
     A wrapper around arrow.humanize(), returns natural time which is less precise than
     django's naturaltime filter. It doesn't display weeks and combination of days & hours.
     """
-    if not (isinstance(value, date) or isinstance(value, arrow.Arrow)):  # datetime is a subclass of date
+    if not (
+        isinstance(value, date) or isinstance(value, arrow.Arrow)
+    ):  # datetime is a subclass of date
         return value
 
     return arrow.get(value).humanize()

junction/base/utils.py

@@ -7,18 +7,35 @@ def get_date_diff_display(start, end):
 
     # year are same now
     if end.month != start.month:
-        return '%s - %s, %s' % (start.strftime('%-d %b'), end.strftime('%-d %b'), start.year)
+        return '%s - %s, %s' % (
+            start.strftime('%-d %b'),
+            end.strftime('%-d %b'),
+            start.year,
+        )
 
     # month and year are same now
     if end.day != start.day:
-        return '%s-%s %s, %s' % (start.strftime('%d'), end.strftime('%d'), start.strftime('%b'), start.year)
+        return '%s-%s %s, %s' % (
+            start.strftime('%d'),
+            end.strftime('%d'),
+            start.strftime('%b'),
+            start.year,
+        )
 
     # day, month and year are same now
     if isinstance(start, dt.date):
         return '%s' % (start.strftime('%-d %b %Y'))
 
     # am/pm, day, month and year are same now
     if end.strftime('%p') != start.strftime('%p'):
-        return '%s - %s, %s' % (start.strftime('%-I:%M%p'), end.strftime('%-I:%M%p'), start.strftime('%-d %b %Y'))
+        return '%s - %s, %s' % (
+            start.strftime('%-I:%M%p'),
+            end.strftime('%-I:%M%p'),
+            start.strftime('%-d %b %Y'),
+        )
 
-    return '%s - %s%s' % (start.strftime('%-I:%M'), end.strftime('%-I:%M'), start.strftime('%p, %-d %b %Y'))
+    return '%s - %s%s' % (
+        start.strftime('%-I:%M'),
+        end.strftime('%-I:%M'),
+        start.strftime('%p, %-d %b %Y'),
+    )