Merge pull request #654 from closeio/black-no-magic-commas

No magic commas

inbox/api/kellogs.py

@@ -64,12 +64,7 @@ def format_messagecategories(messagecategories):
 def format_phone_numbers(phone_numbers):
     formatted_phone_numbers = []
     for number in phone_numbers:
-        formatted_phone_numbers.append(
-            {
-                "type": number.type,
-                "number": number.number,
-            }
-        )
+        formatted_phone_numbers.append({"type": number.type, "number": number.number})
     return formatted_phone_numbers
 
 

inbox/api/ns_api.py

@@ -333,10 +333,7 @@ def status():
             else:
                 account.throttled = False
     return g.encoder.jsonify(
-        {
-            "sync_status": account.sync_status,
-            "throttled": account.throttled,
-        }
+        {"sync_status": account.sync_status, "throttled": account.throttled}
     )
 
 
@@ -2026,10 +2023,7 @@ def sync_deltas():
                 expand=expand,
             )
 
-        response = {
-            "cursor_start": cursor,
-            "deltas": deltas,
-        }
+        response = {"cursor_start": cursor, "deltas": deltas}
         if deltas:
             end_transaction = g.db_session.query(Transaction).get(end_pointer)
             response["cursor_end"] = deltas[-1]["cursor"]

inbox/api/update.py

@@ -37,10 +37,7 @@ def update_message(message, request_data, db_session, optimistic):
 def update_thread(thread, request_data, db_session, optimistic):
     accept_labels = thread.namespace.account.provider == "gmail"
 
-    (
-        unread,
-        starred,
-    ) = parse_flags(request_data)
+    (unread, starred) = parse_flags(request_data)
     if accept_labels:
         labels = parse_labels(request_data, db_session, thread.namespace_id)
     else:

inbox/auth/generic.py

@@ -71,11 +71,7 @@ def authenticate_imap_connection(self, account, conn):
             conn.login(account.imap_username, account.imap_password)
         except IMAPClient.Error as exc:
             if auth_is_invalid(exc):
-                log.error(
-                    "IMAP login failed",
-                    account_id=account.id,
-                    error=exc,
-                )
+                log.error("IMAP login failed", account_id=account.id, error=exc)
                 raise ValidationError(exc)
             elif auth_requires_app_password(exc):
                 raise AppPasswordError(exc)

inbox/auth/oauth.py

@@ -219,9 +219,7 @@ def authenticate_imap_connection(self, account: OAuthAccount, conn: IMAPClient):
                 raise exc from original_exc
 
             log.warning(
-                "Error during IMAP XOAUTH2 login",
-                account_id=account.id,
-                error=exc,
+                "Error during IMAP XOAUTH2 login", account_id=account.id, error=exc
             )
             if not isinstance(exc, ImapSupportDisabledError):
                 raise  # Unknown IMAPClient error, reraise

inbox/auth/utils.py

@@ -89,10 +89,7 @@ def create_imap_connection(host, port, use_timeout=True):
             try:
                 conn.starttls(context)
             except Exception:
-                log.warning(
-                    "STARTTLS supported but failed.",
-                    exc_info=True,
-                )
+                log.warning("STARTTLS supported but failed.", exc_info=True)
                 raise
         else:
             raise SSLNotSupportedError("Required IMAP STARTTLS not supported.")

inbox/config.py

@@ -79,10 +79,7 @@ def _update_config_from_env(config, env):
     srcdir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
 
     if env in ["prod", "staging"]:
-        base_cfg_path = [
-            "/etc/inboxapp/secrets.yml",
-            "/etc/inboxapp/config.json",
-        ]
+        base_cfg_path = ["/etc/inboxapp/secrets.yml", "/etc/inboxapp/config.json"]
     else:
         v = {"env": env, "srcdir": srcdir}
         base_cfg_path = [

inbox/contacts/carddav.py

@@ -118,11 +118,7 @@ def get_cards(self, url):
        </C:addressbook-query>
         """
 
-        response = self.session.request(
-            "REPORT",
-            url,
-            data=payload,
-        )
+        response = self.session.request("REPORT", url, data=payload)
 
         response.raise_for_status()
         return response.content

inbox/contacts/vcard.py

@@ -176,12 +176,7 @@ def vcard_from_vobject(vcard):
         if isinstance(property_value, list):
             property_value = (",").join(property_value)
 
-        vdict[property_name].append(
-            (
-                property_value,
-                line.params,
-            )
-        )
+        vdict[property_name].append((property_value, line.params))
     return vdict
 
 

inbox/crispin.py

@@ -1212,9 +1212,7 @@ def condstore_changed_flags(
         self, modseq: int
     ) -> Dict[int, Union[GmailFlags, Flags]]:
         data: Dict[int, Dict[bytes, Any]] = self.conn.fetch(
-            "1:*",
-            ["FLAGS", "X-GM-LABELS"],
-            modifiers=[f"CHANGEDSINCE {modseq}"],
+            "1:*", ["FLAGS", "X-GM-LABELS"], modifiers=[f"CHANGEDSINCE {modseq}"]
         )
         results: Dict[int, Union[GmailFlags, Flags]] = {}
         for uid, ret in data.items():

inbox/error_handling.py

@@ -33,10 +33,7 @@ def emit(self, record):
         ):
             return
 
-        record.payload_data = {
-            "fingerprint": event,
-            "title": event,
-        }
+        record.payload_data = {"fingerprint": event, "title": event}
 
         return super().emit(record)
 
@@ -110,9 +107,7 @@ def maybe_enable_rollbar():
     )
 
     rollbar.init(
-        ROLLBAR_API_KEY,
-        application_environment,
-        allow_logging_basic_config=False,
+        ROLLBAR_API_KEY, application_environment, allow_logging_basic_config=False
     )
 
     rollbar_handler = SyncEngineRollbarHandler()

inbox/events/google.py

@@ -539,7 +539,7 @@ def sanitize_conference_data(
             if entry_point.get("uri")
         ][:MAX_LIST_LENGTH],
         conference_solution=ConferenceSolution(
-            name=raw_conference_solution.get("name", "")[:MAX_STRING_LENGTH],
+            name=raw_conference_solution.get("name", "")[:MAX_STRING_LENGTH]
         ),
     )
 

inbox/events/microsoft/graph_client.py

@@ -195,7 +195,7 @@ def iter_events(
             # The default amount of events per page is 10,
             # as we want to do the least
             # amount of requests possible we raise it to 500.
-            "top": "500",
+            "top": "500"
         }
 
         if modified_after:
@@ -269,10 +269,7 @@ def iter_event_instances(
         if fields:
             params["$select"] = ",".join(fields)
 
-        yield from self._iter(
-            f"/me/events/{event_id}/instances",
-            params=params,
-        )
+        yield from self._iter(f"/me/events/{event_id}/instances", params=params)
 
     def iter_subscriptions(self) -> Iterable[Dict[str, Any]]:
         """
@@ -403,9 +400,7 @@ def renew_subscription(
             )
         assert expiration.tzinfo == pytz.UTC
 
-        json = {
-            "expirationDateTime": format_datetime(expiration),
-        }
+        json = {"expirationDateTime": format_datetime(expiration)}
 
         return self.request("PATCH", f"/subscriptions/{subscription_id}", json=json)
 

inbox/events/microsoft/graph_types.py

@@ -33,12 +33,7 @@ class MsGraphDateTimeTimeZone(TypedDict):
     "relativeYearly",
 ]
 
-ICalFreq = Literal[
-    "DAILY",
-    "WEEKLY",
-    "MONTHLY",
-    "YEARLY",
-]
+ICalFreq = Literal["DAILY", "WEEKLY", "MONTHLY", "YEARLY"]
 
 
 class MsGraphRecurrencePattern(TypedDict):

inbox/events/microsoft/parse.py

@@ -299,9 +299,7 @@ def convert_msgraph_patterned_recurrence_to_ical_rrule(
     ]
     interval = pattern["interval"] * multiplier
 
-    rrule: Dict[str, str] = {
-        "FREQ": freq,
-    }
+    rrule: Dict[str, str] = {"FREQ": freq}
     if interval != 1:
         rrule["INTERVAL"] = str(interval)
 
@@ -620,10 +618,7 @@ def validate_event(event: MsGraphEvent) -> bool:
 
 
 def parse_event(
-    event: MsGraphEvent,
-    *,
-    read_only: bool,
-    master_event_uid: Optional[str] = None,
+    event: MsGraphEvent, *, read_only: bool, master_event_uid: Optional[str] = None
 ) -> Event:
     """
     Parse event coming from Microsoft Graph API as ORM object.

inbox/ignition.py

@@ -281,7 +281,5 @@ def reset_invalid_autoincrements(engine, schema, key, dry_run=True):
 
 # these are _required_. nylas shouldn't start if these aren't present.
 redis_txn = redis.Redis(
-    config["TXN_REDIS_HOSTNAME"],
-    int(config["REDIS_PORT"]),
-    db=config["TXN_REDIS_DB"],
+    config["TXN_REDIS_HOSTNAME"], int(config["REDIS_PORT"]), db=config["TXN_REDIS_DB"]
 )

inbox/mailsync/frontend.py

@@ -102,12 +102,7 @@ def build_metadata():
                 _, build_id = f.readline().rstrip("\n").split()
                 build_id = build_id[1:-1]  # Remove first and last single quotes.
                 _, git_commit = f.readline().rstrip("\n").split()
-                return jsonify(
-                    {
-                        "build_id": build_id,
-                        "git_commit": git_commit,
-                    }
-                )
+                return jsonify({"build_id": build_id, "git_commit": git_commit})
 
 
 class _QuietHandler(WSGIRequestHandler):

inbox/mailsync/service.py

@@ -112,10 +112,7 @@ def __init__(
             SYNC_EVENT_QUEUE_NAME.format(self.process_identifier)
         )
         self.queue_group = EventQueueGroup(
-            [
-                shared_sync_event_queue_for_zone(self.zone),
-                self.private_queue,
-            ]
+            [shared_sync_event_queue_for_zone(self.zone), self.private_queue]
         )
 
         self.stealing_enabled = config.get("SYNC_STEAL_ACCOUNTS", True)

inbox/models/backends/imap.py

@@ -215,13 +215,7 @@ def categories(self) -> Set[Category]:
         categories.add(self.folder.category)
         return categories
 
-    __table_args__ = (
-        UniqueConstraint(
-            "folder_id",
-            "msg_uid",
-            "account_id",
-        ),
-    )
+    __table_args__ = (UniqueConstraint("folder_id", "msg_uid", "account_id"),)
 
 
 # make pulling up all messages in a given folder fast

inbox/sendmail/smtp/postel.py

@@ -186,10 +186,7 @@ def _upgrade_connection(self):
             try:
                 self.connection.starttls()
             except ssl.SSLError as e:
-                log.warning(
-                    "STARTTLS supported but failed.",
-                    exc_info=True,
-                )
+                log.warning("STARTTLS supported but failed.", exc_info=True)
                 msg = _transform_ssl_error(e.strerror)
                 raise SendMailException(msg, 503)
         else:

inbox/sendmail/smtp/util.py

@@ -24,26 +24,17 @@
         "4.3.5": (429, "Mail server temporarily rejected message."),
         "4.7.1": (429, "Mail server temporarily rejected message."),
     },
-    452: {
-        "4.5.3": (402, "Your message has too many recipients"),
-    },
+    452: {"4.5.3": (402, "Your message has too many recipients")},
     454: {
         "4.7.0": (
             429,
             "Cannot authenticate due to temporary system problem. Try again later.",
         )
     },
-    522: {
-        "5.7.1": (402, "Recipient address rejected."),
-    },
-    530: {
-        "5.7.0": (402, "Recipient address rejected"),
-    },
+    522: {"5.7.1": (402, "Recipient address rejected.")},
+    530: {"5.7.0": (402, "Recipient address rejected")},
     535: {
-        "5.7.1": (
-            429,
-            "Please log in to Gmail with your web browser and try again.",
-        ),
+        "5.7.1": (429, "Please log in to Gmail with your web browser and try again.")
     },
     550: {
         "5.1.1": (

inbox/transactions/search.py

@@ -40,25 +40,19 @@ def __init__(self, poll_interval=30, chunk_size=DOC_UPLOAD_CHUNK_SIZE):
         Greenlet.__init__(self)
 
     def _report_batch_upload(self):
-        metric_names = [
-            "contacts_search_index.transactions.batch_upload",
-        ]
+        metric_names = ["contacts_search_index.transactions.batch_upload"]
 
         for metric in metric_names:
             statsd_client.incr(metric)
 
     def _report_transactions_latency(self, latency):
-        metric_names = [
-            "contacts_search_index.transactions.latency",
-        ]
+        metric_names = ["contacts_search_index.transactions.latency"]
 
         for metric in metric_names:
             statsd_client.timing(metric, latency)
 
     def _publish_heartbeat(self):
-        metric_names = [
-            "contacts_search_index.heartbeat",
-        ]
+        metric_names = ["contacts_search_index.heartbeat"]
 
         for metric in metric_names:
             statsd_client.incr(metric)

inbox/util/blockstore.py

@@ -19,13 +19,7 @@
 
 def _data_file_directory(h):
     return os.path.join(
-        config.get_required("MSG_PARTS_DIRECTORY"),
-        h[0],
-        h[1],
-        h[2],
-        h[3],
-        h[4],
-        h[5],
+        config.get_required("MSG_PARTS_DIRECTORY"), h[0], h[1], h[2], h[3], h[4], h[5]
     )
 
 

inbox/util/testutils.py

@@ -82,10 +82,7 @@ class MockDNSResolver:
     def __init__(self):
         self._registry: Dict[
             Literal["mx", "ns"], Dict[str, Union[Dict[str, str], List[str]]]
-        ] = {
-            "mx": {},
-            "ns": {},
-        }
+        ] = {"mx": {}, "ns": {}}
 
     def _load_records(self, filename):
         self._registry = json.loads(get_data(filename))

inbox/webhooks/microsoft_notifications.py

@@ -142,8 +142,7 @@ def event_update(calendar_public_id):
 
 
 def handle_event_deletions(
-    calendar: Calendar,
-    change_notifications: List[MsGraphChangeNotification],
+    calendar: Calendar, change_notifications: List[MsGraphChangeNotification]
 ) -> None:
     deleted_event_uids = [
         change_notification["resourceData"]["id"]