I see a codebase and I want it painted black

Just run Black. No other change.

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

Author: abompard

bugzilla2fedmsg/relay.py

@@ -31,16 +31,16 @@ def _bz4_compat_transform(bug, event, objdict, obj):
     if bug.get("operating_system"):
         bug["op_sys"] = bug["operating_system"]
     if not bug.get("weburl"):
-        bug["weburl"] = "https://bugzilla.redhat.com/show_bug.cgi?id=%s" % bug['id']
+        bug["weburl"] = "https://bugzilla.redhat.com/show_bug.cgi?id=%s" % bug["id"]
     event["who"] = event["user"]["login"]
     event["changes"] = event.get("changes", [])
     for change in event["changes"]:
         change["field_name"] = change["field"]
-    if obj == 'comment':
+    if obj == "comment":
         # I would expect this to be real_name so we're not spaffing
         # email addresses all over, but I checked and historically
         # it was definitely login
-        objdict[obj]['author'] = event.get('user', {}).get('login', '')
+        objdict[obj]["author"] = event.get("user", {}).get("login", "")
 
 
 class MessageRelay:
@@ -61,18 +61,18 @@ def on_stomp_message(self, body, headers):
         # destination looks something like
         # "/topic/VirtualTopic.eng.bugzilla.bug.modify"
         # this splits out the 'bug' part
-        obj = headers['destination'].split('bugzilla.')[1].split('.')[0]
+        obj = headers["destination"].split("bugzilla.")[1].split(".")[0]
         if obj not in body:
             LOGGER.debug("DROP: message has no object field. Non public.")
             return
         objdict = {}
         bug = None
-        if obj == 'bug':
+        if obj == "bug":
             # just take the bug dict, converting datetimes
-            bug = convert_datetimes(body['bug'])
+            bug = convert_datetimes(body["bug"])
         else:
             # unpick the bug dict from the object dict
-            bug = convert_datetimes(body[obj].pop('bug'))
+            bug = convert_datetimes(body[obj].pop("bug"))
             objdict[obj] = convert_datetimes(body[obj])
 
         # As of https://bugzilla.redhat.com/show_bug.cgi?id=1248259, bugzilla
@@ -93,7 +93,7 @@ def on_stomp_message(self, body, headers):
             _bz4_compat_transform(bug, event, objdict, obj)
 
         topic = "bug.update"
-        if 'bug.create' in headers['destination']:
+        if "bug.create" in headers["destination"]:
             topic = "bug.new"
 
         # construct message dict, add the object dict we got earlier
@@ -105,7 +105,7 @@ def on_stomp_message(self, body, headers):
         )
         body.update(objdict)
 
-        LOGGER.debug("Republishing #%s" % bug['id'])
+        LOGGER.debug("Republishing #%s" % bug["id"])
         messageclass = MessageV1
         if self._bz4_compat_mode:
             messageclass = MessageV1BZ4
@@ -117,6 +117,8 @@ def on_stomp_message(self, body, headers):
             )
             publish(message)
         except PublishReturned as e:
-            LOGGER.warning("Fedora Messaging broker rejected message {}: {}".format(message.id, e))
+            LOGGER.warning(
+                "Fedora Messaging broker rejected message {}: {}".format(message.id, e)
+            )
         except ConnectionException as e:
             LOGGER.warning("Error sending message {}: {}".format(message.id, e))

bugzilla2fedmsg/utils.py

@@ -14,18 +14,15 @@
 
 
 def convert_datetimes(obj):
-    """ Recursively convert the ISO-8601ish date/time strings we get
+    """Recursively convert the ISO-8601ish date/time strings we get
     from stomp to epoch integers (because this is what fedmsg used to
     emit when we sent it datetime instances).
     """
 
     if isinstance(obj, list):
         return [convert_datetimes(item) for item in obj]
     elif isinstance(obj, dict):
-        return dict([
-            (k, convert_datetimes(v))
-            for k, v in obj.items()
-        ])
+        return dict([(k, convert_datetimes(v)) for k, v in obj.items()])
     else:
         try:
             # the string we get is YYYY-MM-DDTHH:MM:SS, no timezone,

bugzilla2fedmsg_schema/schema.py

@@ -20,10 +20,10 @@ def __str__(self):
     def summary(self):
         """A summary of the message."""
         (user, _) = email_to_fas(self._primary_email)
-        idx = self.bug['id']
-        title = self.bug['summary']
-        action = self.body['event']['action']
-        target = self.body['event']['target']
+        idx = self.bug["id"]
+        title = self.bug["summary"]
+        action = self.body["event"]["action"]
+        target = self.body["event"]["target"]
 
         if len(title) > 40:
             title = title[:40] + "..."
@@ -32,19 +32,21 @@ def summary(self):
             tmpl = "{user} filed a new bug RHBZ#{idx} '{title}'"
             return tmpl.format(user=user, idx=idx, title=title)
 
-        elif self.body['event']['action'] == "create":
+        elif self.body["event"]["action"] == "create":
             tmpl = "{user} added {target} on RHBZ#{idx} '{title}'"
             return tmpl.format(user=user, target=target, idx=idx, title=title)
 
         # at this point 'action' must be "modify": we're modifying the
         # target
-        fields = [d['field'] for d in self.body['event'].get('changes', [])]
+        fields = [d["field"] for d in self.body["event"].get("changes", [])]
         fields = comma_join(fields)
         if target == "bug":
             tmpl = "{user} updated {fields} on RHBZ#{idx} '{title}'"
             return tmpl.format(user=user, fields=fields, idx=idx, title=title)
         tmpl = "{user} updated {fields} for {target} on RHBZ#{idx} '{title}'"
-        return tmpl.format(user=user, fields=fields, target=target, idx=idx, title=title)
+        return tmpl.format(
+            user=user, fields=fields, target=target, idx=idx, title=title
+        )
 
     @property
     def url(self):
@@ -53,7 +55,7 @@ def url(self):
         Returns:
             str: A relevant URL.
         """
-        return "https://bugzilla.redhat.com/show_bug.cgi?id={}".format(self.bug['id'])
+        return "https://bugzilla.redhat.com/show_bug.cgi?id={}".format(self.bug["id"])
 
     @property
     def app_icon(self):
@@ -78,14 +80,14 @@ def packages(self):
         # these are Bugzilla components that are not Fedora packages
         # add any more you can think of
         notpackages = [
-            'distribution',
-            'LiveCD',
-            'LiveCD - FEL',
-            'LiveCD - Games',
-            'LiveCD - KDE',
-            'LiveCD - LXDE',
-            'LiveCD - Xfce',
-            'Package Review',
+            "distribution",
+            "LiveCD",
+            "LiveCD - FEL",
+            "LiveCD - Games",
+            "LiveCD - KDE",
+            "LiveCD - LXDE",
+            "LiveCD - Xfce",
+            "Package Review",
         ]
         if compname in notpackages:
             return []
@@ -101,7 +103,7 @@ def _primary_email(self):
         """The email for the primary user associated with the action
         that generated this message.
         """
-        return self.body['event']['user']['login']
+        return self.body["event"]["user"]["login"]
 
     @property
     def _all_emails(self):
@@ -114,27 +116,27 @@ def _all_emails(self):
         users.add(self._primary_email)
 
         # bug reporter and assignee
-        users.add(self.bug['reporter']['login'])
+        users.add(self.bug["reporter"]["login"])
         users.add(self.assigned_to_email)
 
-        for change in self.body['event'].get('changes', []):
-            if change['field'] == "cc":
+        for change in self.body["event"].get("changes", []):
+            if change["field"] == "cc":
                 # anyone added to CC list
-                for user in change['added'].split(','):
+                for user in change["added"].split(","):
                     user.strip()
                     if user:
                         users.add(user)
-            elif change['field'] == "flag.needinfo":
+            elif change["field"] == "flag.needinfo":
                 # anyone for whom a 'needinfo' flag is set
                 # this is extracting the email from a value like:
                 # "? (senrique@redhat.com)"
-                user = change['added'].split('(', 1)[1].rsplit(')', 1)[0]
+                user = change["added"].split("(", 1)[1].rsplit(")", 1)[0]
                 if user:
                     users.add(user)
 
         # Strip anything that made it in erroneously
         for user in list(users):
-            if user.endswith('lists.fedoraproject.org'):
+            if user.endswith("lists.fedoraproject.org"):
                 users.remove(user)
 
         users = list(users)
@@ -233,11 +235,31 @@ class MessageV1(BaseMessage):
                     },
                     "whiteboard": {"type": "string"},
                 },
-                "required": ["alias", "assigned_to", "classification", "component",
-                             "creation_time", "flags", "id", "is_private", "keywords",
-                             "last_change_time", "operating_system", "platform", "priority",
-                             "product", "qa_contact", "reporter", "resolution", "severity",
-                             "status", "summary", "url", "version", "whiteboard"],
+                "required": [
+                    "alias",
+                    "assigned_to",
+                    "classification",
+                    "component",
+                    "creation_time",
+                    "flags",
+                    "id",
+                    "is_private",
+                    "keywords",
+                    "last_change_time",
+                    "operating_system",
+                    "platform",
+                    "priority",
+                    "product",
+                    "qa_contact",
+                    "reporter",
+                    "resolution",
+                    "severity",
+                    "status",
+                    "summary",
+                    "url",
+                    "version",
+                    "whiteboard",
+                ],
             },
             "event": {
                 "description": "An object representing the event the message relates to",
@@ -260,8 +282,15 @@ class MessageV1(BaseMessage):
                         },
                     },
                 },
-                "required": ["action", "bug_id", "change_set", "routing_key", "target",
-                             "time", "user"],
+                "required": [
+                    "action",
+                    "bug_id",
+                    "change_set",
+                    "routing_key",
+                    "target",
+                    "time",
+                    "user",
+                ],
             },
             "comment": {
                 "description": "An object representing a comment affected by the event",
@@ -289,9 +318,18 @@ class MessageV1(BaseMessage):
                     "is_private": {"type": "boolean"},
                     "last_change_time": {"type": "number"},
                 },
-                "required": ["content_type", "creation_time", "description", "file_name",
-                             "flags", "id", "is_obsolete", "is_patch", "is_private",
-                             "last_change_time"],
+                "required": [
+                    "content_type",
+                    "creation_time",
+                    "description",
+                    "file_name",
+                    "flags",
+                    "id",
+                    "is_obsolete",
+                    "is_patch",
+                    "is_private",
+                    "last_change_time",
+                ],
             },
         },
         "required": ["bug", "event"],
@@ -300,22 +338,22 @@ class MessageV1(BaseMessage):
     @property
     def bug(self):
         """The bug dictionary from the message."""
-        return self.body['bug']
+        return self.body["bug"]
 
     @property
     def assigned_to_email(self):
         """The email address of the user to which the bug is assigned."""
-        return self.bug['assigned_to']['login']
+        return self.bug["assigned_to"]["login"]
 
     @property
     def component_name(self):
         """The name of the component against which the bug is filed."""
-        return self.bug['component']['name']
+        return self.bug["component"]["name"]
 
     @property
     def product_name(self):
         """The name of the product against which the bug is filed."""
-        return self.bug['product']['name']
+        return self.bug["product"]["name"]
 
 
 class MessageV1BZ4(MessageV1):
@@ -345,19 +383,19 @@ class MessageV1BZ4(MessageV1):
     @property
     def bug(self):
         """The bug dictionary from the message."""
-        return self.body['bug']
+        return self.body["bug"]
 
     @property
     def assigned_to_email(self):
         """The email address of the user to which the bug is assigned."""
-        return self.bug['assigned_to']
+        return self.bug["assigned_to"]
 
     @property
     def component_name(self):
         """The name of the component against which the bug is filed."""
-        return self.bug['component']
+        return self.bug["component"]
 
     @property
     def product_name(self):
         """The name of the product against which the bug is filed."""
-        return self.bug['product']
+        return self.bug["product"]

bugzilla2fedmsg_schema/utils.py

@@ -2,7 +2,7 @@
 
 
 def comma_join(fields, oxford=True):
-    """ Join together words. """
+    """Join together words."""
 
     def fmt(field):
         return "'%s'" % field
@@ -30,6 +30,6 @@ def email_to_fas(email):
     we can just do this easily. For all other addresses, we really
     need that full feature added to fedora-messaging.
     """
-    if email.endswith('@fedoraproject.org'):
-        return (email.rsplit('@', 1)[0], True)
+    if email.endswith("@fedoraproject.org"):
+        return (email.rsplit("@", 1)[0], True)
     return (email, False)

setup.py

@@ -4,13 +4,13 @@
 
 
 setup(
-    name='bugzilla2fedmsg',
-    version='1.0.0',
-    description='Consume Bugzilla messages over STOMP and republish to Fedora Messaging',
-    license='LGPLv2+',
-    author='Ralph Bean',
-    author_email='rbean@redhat.com',
-    url='https://github.com/fedora-infra/bugzilla2fedmsg',
+    name="bugzilla2fedmsg",
+    version="1.0.0",
+    description="Consume Bugzilla messages over STOMP and republish to Fedora Messaging",
+    license="LGPLv2+",
+    author="Ralph Bean",
+    author_email="rbean@redhat.com",
+    url="https://github.com/fedora-infra/bugzilla2fedmsg",
     # Possible options are at https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
         "Development Status :: 5 - Production/Stable",