From b0072f779e5719327e9b63f6ae21e56b53700749 Mon Sep 17 00:00:00 2001
From: Abigail <me@kb6.ee>
Date: Wed, 25 Dec 2019 02:48:59 -0500
Subject: [PATCH] addressing the issue for once

---
 exts/ae7q.py  | 17 ++++++++---------
 exts/base.py  |  3 +--
 exts/grid.py  | 12 ++++++------
 exts/qrz.py   |  3 +--
 exts/study.py |  8 ++++----
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/exts/ae7q.py b/exts/ae7q.py
index e27a019..43a6981 100644
--- a/exts/ae7q.py
+++ b/exts/ae7q.py
@@ -97,19 +97,18 @@ class AE7QCog(commands.Cog):
 
         for row in table_contents[0:3]:
             header = f'**{row[0]}** ({row[1]})'
-            body = f'Class: *{row[2]}*\n'
-            body += f'Region: *{row[3]}*\n'
-            body += f'Status: *{row[4]}*\n'
-            body += f'Granted: *{row[5]}*\n'
-            body += f'Effective: *{row[6]}*\n'
-            body += f'Cancelled: *{row[7]}*\n'
-            body += f'Expires: *{row[8]}*'
+            body = (f'Class: *{row[2]}*\n'
+                    f'Region: *{row[3]}*\n'
+                    f'Status: *{row[4]}*\n'
+                    f'Granted: *{row[5]}*\n'
+                    f'Effective: *{row[6]}*\n'
+                    f'Cancelled: *{row[7]}*\n'
+                    f'Expires: *{row[8]}*')
             embed.add_field(name=header, value=body, inline=False)
 
         embed.description = desc
         if len(table_contents) > 3:
-            embed.description += f'\nRecords 1 to 3 of {len(table_contents)}.'
-            embed.description += ' See ae7q.com for more...'
+            embed.description += f'\nRecords 1 to 3 of {len(table_contents)}. See ae7q.com for more...'
 
         await ctx.send(embed=embed)
 
diff --git a/exts/base.py b/exts/base.py
index 51ba2f7..08d2b2c 100644
--- a/exts/base.py
+++ b/exts/base.py
@@ -22,8 +22,7 @@ import common as cmn
 
 class QrmHelpCommand(commands.HelpCommand):
     def __init__(self):
-        super().__init__(command_attrs={'help': 'Shows help about qrm or a command',
-                                        'aliases': ['h']})
+        super().__init__(command_attrs={'help': 'Shows help about qrm or a command', 'aliases': ['h']})
 
     def get_bot_mapping(self):
         bot = self.context.bot
diff --git a/exts/grid.py b/exts/grid.py
index 570b2e9..2f2d41b 100644
--- a/exts/grid.py
+++ b/exts/grid.py
@@ -83,18 +83,18 @@ If two grid squares are given, the distance and azimuth between them is calculat
                     # Haversine formula
                     d_lat = math.radians(loc2[0] - loc[0])
                     d_lon = math.radians(loc2[1] - loc[1])
-                    a = math.sin(d_lat/2) ** 2 +\
-                        math.cos(math.radians(loc[0])) * math.cos(math.radians(loc2[0])) *\
-                        math.sin(d_lon/2) ** 2
+                    a = math.sin(d_lat/2) ** 2
+                        + math.cos(math.radians(loc[0])) * math.cos(math.radians(loc2[0]))
+                        * math.sin(d_lon/2) ** 2
                     c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a))
                     d = radius * c
                     d_mi = 0.6213712 * d
 
                     # Bearing
                     y_dist = math.sin(math.radians(loc2[1]-loc[1])) * math.cos(math.radians(loc2[0]))
-                    x_dist = math.cos(math.radians(loc[0])) * math.sin(math.radians(loc2[0])) -\
-                        math.sin(math.radians(loc[0])) * math.cos(math.radians(loc2[0])) *\
-                        math.cos(math.radians(loc2[1] - loc[1]))
+                    x_dist = math.cos(math.radians(loc[0])) * math.sin(math.radians(loc2[0]))
+                             - math.sin(math.radians(loc[0])) * math.cos(math.radians(loc2[0]))
+                             * math.cos(math.radians(loc2[1] - loc[1]))
                     bearing = (math.degrees(math.atan2(y_dist, x_dist)) + 360) % 360
 
                     embed = cmn.embed_factory(ctx)
diff --git a/exts/qrz.py b/exts/qrz.py
index 825e60e..166dac8 100644
--- a/exts/qrz.py
+++ b/exts/qrz.py
@@ -133,8 +133,7 @@ def qrz_process_info(data: dict):
         state = f', {data["state"]}'
     else:
         state = ''
-    address = data.get('addr1', '') + '\n' + data.get('addr2', '') + \
-        state + ' ' + data.get('zip', '')
+    address = data.get('addr1', '') + '\n' + data.get('addr2', '') + state + ' ' + data.get('zip', '')
     address = address.strip()
     if address == '':
         address = None
diff --git a/exts/study.py b/exts/study.py
index fb8298e..faf40a0 100644
--- a/exts/study.py
+++ b/exts/study.py
@@ -75,10 +75,10 @@ class StudyCog(commands.Cog):
             embed.description = self.source
             embed.colour = cmn.colours.good
             embed.add_field(name='Question:', value=question['text'], inline=False)
-            embed.add_field(name='Answers:', value='**A:** ' + question['answers']['A'] +
-                            '\n**B:** ' + question['answers']['B'] +
-                            '\n**C:** ' + question['answers']['C'] +
-                            '\n**D:** ' + question['answers']['D'], inline=False)
+            embed.add_field(name='Answers:', value='**A:** ' + question['answers']['A']
+                            + '\n**B:** ' + question['answers']['B']
+                            + '\n**C:** ' + question['answers']['C']
+                            + '\n**D:** ' + question['answers']['D'], inline=False)
             embed.add_field(name='Answer:', value='Type _?rqa_ for answer', inline=False)
             if 'image' in question:
                 image_url = f'https://hamstudy.org/_1330011/images/{selected_pool.split("_",1)[1]}/{question["image"]}'