Merge pull request #654 from airbnb/csharplus-improve-code-quality

Refactoring to improve code quality

Author: csharplus

knowledge_repo/app/routes/debug.py

@@ -86,7 +86,7 @@ def show_views():
 
         methods = ','.join(rule.methods)
         url = url_for(rule.endpoint, **options)
-        line = unquote("{:50s} {:20s} {}".format(rule.endpoint, methods, url))
+        line = unquote(f'{rule.endpoint:50s} {methods:20s} {url}')
         output.append(line)
 
     return "<br />".join(sorted(output))

knowledge_repo/app/utils/time.py

@@ -15,10 +15,10 @@ def human_readable_time_delta(seconds):
     if seconds is None:
         return "Never"
     elif seconds < 60:
-        return "{:d} seconds ago".format(int(round(seconds)))
+        return f'{seconds:.0f} seconds ago'
     elif seconds < 60 * 60:
-        return "{:d} minutes ago".format(int(round(seconds / 60)))
+        return f'{(seconds / 60):.0f} minutes ago'
     elif seconds < 24 * 60 * 60:
-        return "{:d} hours ago".format(int(round(seconds / 60 / 60)))
+        return f'{(seconds / 60 / 60):.0f} hours ago'
     else:
-        return "{:d} days ago".format(int(round(seconds / 60 / 60 / 24)))
+        return f'{(seconds / 60 / 60 / 24):.0f} days ago'

knowledge_repo/converters/html.py

@@ -188,7 +188,8 @@ def handleMatch(self, m):
 
 class MathJaxExtension(markdown.Extension):
     def extendMarkdown(self, md, md_globals=None):
-        # Needs to come before escape matching because \ is pretty important in LaTeX
+        # Needs to come before escape matching because \ is
+        # pretty important in LaTeX
         md.inlinePatterns.add('mathjax', MathJaxPattern(), '<escape')
 
 
@@ -217,7 +218,10 @@ def _render_markdown(self,
 
         # proxy posts are assumed to be embeddable links
         if PROXY in self.kp.headers:
-            return None, '<a href="{0}">Linked Post</a>\n<iframe width=100% height=1000 src="{0}"></iframe>'.format(self.kp.headers['proxy'].strip())
+            proxy = self.kp.headers[PROXY].strip()
+            return None, (f'<a href="{proxy}">Linked Post</a>\n'
+                          f'<iframe width=100% height=1000 '
+                          f'src="{proxy}"></iframe>')
 
         html = ''
         if not skip_headers:
@@ -256,7 +260,8 @@ def urlmapper_proxy(name, match):
                     return match.group(0).replace(match.group('url'), new_url)
             return None
 
-        return SubstitutionMapper(patterns=patterns, mappers=[urlmapper_proxy]).apply(html)
+        return SubstitutionMapper(patterns=patterns,
+                                  mappers=[urlmapper_proxy]).apply(html)
 
     # Utility methods
     def render_headers(self):
@@ -287,5 +292,6 @@ def base64_encode_image_mapper(self, tag, url):
                 image_data = base64.b64encode(self.kp_images[url])
                 image_mimetype = mimetypes.guess_type(url)[0]
                 if image_mimetype is not None:
-                    return f'data:{image_mimetype};base64, ' + image_data.decode(UTF8)
+                    return f'data:{image_mimetype};base64, ' + \
+                        image_data.decode(UTF8)
         return None

knowledge_repo/postprocessors/extract_images.py

@@ -65,7 +65,8 @@ def find_images(self, md):
 
     def collect_images_for_pattern(self, md, pattern=None):
         p = re.compile(pattern)
-        return [{'offset': m.start(), 'tag': m.group(0), 'src': m.group('src')} for m in p.finditer(md)]
+        return [{'offset': m.start(), 'tag': m.group(0), 'src': m.group('src')}
+                for m in p.finditer(md)]
 
     def collect_images(self, kp, images):
         image_mapping = {}
@@ -99,7 +100,8 @@ def collect_images(self, kp, images):
     def skip_image(self, kp, image):
         if re.match('http[s]?://', image['src']):
             return True
-        if image['src'].startswith('images/') and image['src'] in kp.image_paths:
+        if image['src'].startswith('images/') and \
+                image['src'] in kp.image_paths:
             return True
         return False
 

knowledge_repo/postprocessors/extract_images_to_local.py

@@ -56,7 +56,7 @@ def copy_image(self, kp, img_path, is_ref=False, repo_name='knowledge'):
 
             # Copy images to local http server directory
             new_path = os.path.join(self.image_dir, fname_img)
-            logger.info("Copying image {} to {}".format(tmp_path, new_path))
+            logger.info(f'Copying image {tmp_path} to {new_path}')
             try:
                 shutil.copyfile(tmp_path, new_path)
             except Exception as e:

knowledge_repo/postprocessors/extract_images_to_s3.py

@@ -45,13 +45,11 @@ def copy_image(self, kp, img_path, is_ref=False, repo_name='knowledge'):
             img_ext = posixpath.splitext(img_path)[1]
 
             # Make random filename for image
-            random_string = ''.join(random.choice(
-                string.ascii_lowercase) for i in range(6))
-            fname_img = '{repo_name}_{time}_{random_string}{ext}'.format(
-                repo_name=repo_name,
-                time=int(round(time.time() * 100)),
-                random_string=random_string,
-                ext=img_ext).strip().replace(' ', '-')
+            random_name = ''.join(
+                random.choice(string.ascii_lowercase) for i in range(6))
+            timestamp = int(round(time.time() * 100))
+            fname_img = (f'{repo_name}_{timestamp}_'
+                         f'{random_name}{img_ext}').strip().replace(' ', '-')
 
             # Copy image to accessible folder on S3
             fname_s3 = posixpath.join(self.s3_image_root, repo_name, fname_img)