From: Oleg Broytman <phd@phdru.name>
Date: Thu, 11 Jun 2020 15:51:55 +0000 (+0300)
Subject: Style(phd.py): Fix `flake8` warnings
X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fphdru.name.git;a=commitdiff_plain;h=e1630324d6e4e0c83d68f59bc87a222f89874a2e

Style(phd.py): Fix `flake8` warnings
---

diff --git a/phd.py b/phd.py
index eb50b31..7954e70 100644
--- a/phd.py
+++ b/phd.py
@@ -10,6 +10,7 @@ from blog_db import load_blog
 
 url_re = r"(((https?|ftp|gopher|telnet)://|(mailto|file|news|about|ed2k|irc|sip|magnet):)[^' \t<>\"]+|(www|web|w3)[A-Za-z0-9_-]*\.[A-Za-z0-9._-]+\.[^' \t<>\"]+)[A-Za-z0-9/]"
 
+
 def _url2href(match):
     url = match.group(0)
     return '<a href="%s">%s</a>' % (url, url)
@@ -17,12 +18,15 @@ def _url2href(match):
 
 full_dirs = len(os.getcwd().split('/')) + 1
 
+
 class phd(Template):
     def __init__(self, *args, **kw):
         if not hasattr(self, "_fileBaseName"):
-            self._fileDirName, self._fileBaseName = os.path.split(os.path.abspath(self._CHEETAH_src))
+            self._fileDirName, self._fileBaseName = \
+                os.path.split(os.path.abspath(self._CHEETAH_src))
         Template.__init__(self, *args, **kw)
-        directories = self._fileDirName.split('/')[full_dirs:] # remove directories up to "./files"
+        # remove directories up to "./files"
+        directories = self._fileDirName.split('/')[full_dirs:]
         dirs_to_root = len(directories)
         if dirs_to_root:
             root = "../"*dirs_to_root
@@ -42,7 +46,6 @@ class phd(Template):
             return "%s, %s" % (start_year, this_year)
         return "%s-%s" % (start_year, this_year)
 
-
     def body(self):
         if hasattr(self, "body_html"):
             return self.body_html()
@@ -90,18 +93,17 @@ class phd(Template):
         body = parts["body"]
         parts = []
         for part in (title, subtitle, body):
-             if not part:
-                  continue
-             if PY2 and not isinstance(part, bytes):
-                  part = part.encode('utf-8')
-             parts.append(part)
+            if not part:
+                continue
+            if PY2 and not isinstance(part, bytes):
+                part = part.encode('utf-8')
+            parts.append(part)
         return "\n\n".join(parts)
 
     def mkd2html(self):
         from markdown import markdown
         return markdown(self.body_mkd(), output_format="html")
 
-
     def find_near_blog_posts(self):
         if not self.path.startswith("/Russian/blog/"):
             return None, None, None, None
@@ -113,7 +115,7 @@ class phd(Template):
         filename = self._fileBaseName
 
         prev_key = prev_blog_post = current_key = current_blog_post = \
-                next_key = next_blog_post = None
+            next_key = next_blog_post = None
         blog = load_blog()
         for key in sorted(blog):
             for blog_post in sorted(blog[key]):
@@ -130,37 +132,43 @@ class phd(Template):
                     return prev_key, prev_blog_post, next_key, next_blog_post
         return current_key, current_blog_post, None, None
 
-
     def img_thumbnail_800_1024(self, img_name):
         return """\
 <img src="%(img_name)s-thumbnail.jpg" alt="%(img_name)s-thumbnail.jpg" /><br />
 <a href="%(img_name)s-800x600.jpg">800x600</a>, <a href="%(img_name)s-1024x800.jpg">1024x800</a>""" % {"img_name": img_name}
 
     def wikipedia(self, query):
-        return "https://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+        return "https://en.wikipedia.org/wiki/%s" % quote_string(
+            query.replace(' ', '_'), ext_safe=',')
 
     def wikipedia_ru(self, query):
-        return "https://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+        return "https://ru.wikipedia.org/wiki/%s" % quote_string(
+            query.replace(' ', '_'), ext_safe=',')
 
     def startpage(self, query):
-         return "https://startpage.com/do/search?q=%s" % quote_string(query)
+        return "https://startpage.com/do/search?q=%s" % quote_string(query)
 
     search = startpage
 
     def nigma(self, query):
-         return "http://www.nigma.ru/index.php?s=%s" % quote_string(query)
+        return "http://www.nigma.ru/index.php?s=%s" % quote_string(query)
 
     def yandex(self, query):
-        return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" % quote_string(query, "cp1251")
+        return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" \
+            % quote_string(query, "cp1251")
 
     def google(self, query):
-        return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+        return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" \
+            % quote_string(query)
 
     def google_ru(self, query):
-        return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+        return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" \
+            % quote_string(query)
 
     def lurkmoar(self, query):
-         return "https://lurkmore.to/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+        return "https://lurkmore.to/%s" % quote_string(
+            query.replace(' ', '_'), ext_safe=',')
+
 
 def quote_string(s, to_encoding="utf-8", ext_safe=''):
     if isinstance(s, bytes):