Style: Fix flake8 E302 expected 2 blank lines, found 1

diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py
index 6250af91603cfb8e6125b049e900f33c3be0e9ef..c5bbb6265f73e6b298e7a475fc0cf7fe0eb698f7 100644 (file)
--- a/Robots/bkmk_rforking.py
+++ b/Robots/bkmk_rforking.py
@@ -28,6 +28,7 @@ sys.stderr = open("err.log", 'a')
 check_subp = None
 subp_pipe = None
 
+
 def stop_subp(log):
     global check_subp, subp_pipe
     if check_subp:
@@ -35,6 +36,7 @@ def stop_subp(log):
         del check_subp
     del subp_pipe
 
+
 def restart_subp(log):
     global check_subp, subp_pipe
     stop_subp(log)
@@ -46,6 +48,7 @@ def restart_subp(log):
 
 _set_subproc = True
 
+
 class robot_forking(Robot):
     subproc = 'urllib2'  # Default subprocess
 

diff --git a/Robots/bkmk_rurllib.py b/Robots/bkmk_rurllib.py
index 2c32291898913b19f07cc8580c44a741b66f3079..3ef47eba975ac4d475306915ec862701d0f33c05 100644 (file)
--- a/Robots/bkmk_rurllib.py
+++ b/Robots/bkmk_rurllib.py
@@ -22,6 +22,7 @@ class RedirectException(Exception):
         self.errcode = errcode
         self.newurl = newurl
 
+
 class MyURLopener(urllib.URLopener):
     # Error 301 -- relocated (permanently)
     def http_error_301(self, url, fp, errcode, errmsg, headers, data=None):
@@ -70,6 +71,7 @@ urllib._urlopener.addheader('Connection', 'close')
 urllib_ftpwrapper = urllib.ftpwrapper
 ftpcache_key = None
 
+
 class myftpwrapper(urllib_ftpwrapper):
     def __init__(self, user, passwd, host, port, dirs):
         urllib_ftpwrapper.__init__(self, user, passwd, host, port, dirs)

diff --git a/Robots/bkmk_rurllib2.py b/Robots/bkmk_rurllib2.py
index a5714a19abd4e0d1c0e2b76404d23b0dd143f129..4cb684bae94fbc642f9af0a4594783f15fab3be8 100644 (file)
--- a/Robots/bkmk_rurllib2.py
+++ b/Robots/bkmk_rurllib2.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2014-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2014-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['robot_urllib2']
@@ -19,6 +19,7 @@ from Robots.bkmk_robot_base import robot_base, get_error
 
 _fw = None
 
+
 class FTPHandler(urllib2.FTPHandler):
     def connect_ftp(self, user, passwd, host, port, dirs, timeout):
         global _fw

diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py
index 6053bd1d360f0fda72991ab53b360406df6beba1..1a34e3a1a02658c75dbe3736e207261009893d4a 100644 (file)
--- a/Storage/bkmk_stjson.py
+++ b/Storage/bkmk_stjson.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['storage_json']
@@ -188,6 +188,7 @@ def convert_date_to_json(date):
         date = int(float(date) * 10**6)
     return date
 
+
 def convert_date_from_json(date):
     if date:
         date = float(date)
@@ -195,16 +196,19 @@ def convert_date_from_json(date):
             date /= 10.0**6
     return date
 
+
 def encode_title(title):
     if title:
         return title.encode("UTF-8", "xmlcharrefreplace")
     return title
 
+
 def get_str(record, name):
     if name in record:
         return record[name].encode('utf-8')
     return ''
 
+
 def get_comment(annos):
     if not annos:
         return ''
@@ -215,6 +219,7 @@ def get_comment(annos):
 
     return ''
 
+
 def make_annos(value, name="bookmarkProperties/description"):
     return [{
         "expires": 4,

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index f7a1d654a2274780cb2284cf64040926e10f8a27..eae6e5ff214db06491b2bc613be04b2bac0c0101 100644 (file)
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -4,7 +4,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['writer_html']
@@ -22,6 +22,7 @@ def dump_comment(comment):
 
 ind_s = " "*4
 
+
 class writer_html(Writer):
     filename = "bookmarks.html"
 

diff --git a/bkmk_objects.py b/bkmk_objects.py
index f313bd377811d11c9675915f020a436235dee17a..f66272bf8dbe2cee465d730e2ff6fc607c6bdadd 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -18,6 +18,7 @@ import os, urllib
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
+
 class Folder(list):
     isFolder = 1
     isBookmark = 0
@@ -200,6 +201,7 @@ def make_tree(linear):
 
     return root_folder
 
+
 def break_tree(linear):
     del linear[0]
 
@@ -212,6 +214,7 @@ def quote_title(title):
         title = title.replace("'", "'")
     return title
 
+
 def unquote_title(title):
     if BKMK_FORMAT == "MOZILLA":
         from HTMLParser import HTMLParser
@@ -229,6 +232,7 @@ def parse_params(param_str):
         param_list[key] = value
     return main_param, param_list
 
+
 def set_params(obj, params):
     if hasattr(params, "items"):
         params = params.items()

diff --git a/check_dups.py b/check_dups.py
index 0a267ac60544a28322657df7ba7227aa26e7deaa..94ae3f0a51731ad42c771db98bbaf137b69f9e61 100755 (executable)
--- a/check_dups.py
+++ b/check_dups.py
@@ -9,12 +9,13 @@ import sys
 
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
 log_file = None
 
+
 def report_dup(href, object_no):
     s = "Duplicate URL: %s (first at rec. %d)" % (href, object_no)
 
@@ -43,7 +44,7 @@ def run():
         pass
 
     if report_stats:
-        print("Broytman check_dups, Copyright (C) 2000-2017 PhiloSoft Design")
+        print("Broytman check_dups, Copyright (C) 2000-2023 PhiloSoft Design")
 
     if args:
         sys.stderr.write("check_urls: too many arguments\n")

diff --git a/check_url.py b/check_url.py
index 46135c53e6877a3e186c8a48f7ab4a6f764ed963..7b52c7002f2312a0ead0df92b168bc57a50d54f9 100755 (executable)
--- a/check_url.py
+++ b/check_url.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import sys
@@ -13,6 +13,7 @@ import httplib
 
 HTTP = httplib.HTTP
 
+
 class MyHTTP(HTTP):
     def _setup(self, conn):
         HTTP._setup(self, conn)
@@ -25,7 +26,7 @@ from Writers.bkmk_wflad import strftime
 
 
 def run():
-    print("Broytman check_url, Copyright (C) 2010-2017 PhiloSoft Design")
+    print("Broytman check_url, Copyright (C) 2010-2023 PhiloSoft Design")
 
     if len(sys.argv) < 2:
         sys.stderr.write("Usage: check_url.py url1 [url2...]\n")

diff --git a/parse_html/bkmk_parse_html.py b/parse_html/bkmk_parse_html.py
index 7bdc5664470b2c2ae4499be6f7519689daae4ae6..07fe32e3e7e6a658ec82f0123acff746a7ac0b01 100644 (file)
--- a/parse_html/bkmk_parse_html.py
+++ b/parse_html/bkmk_parse_html.py
@@ -69,6 +69,7 @@ from htmlentitydefs import name2codepoint
 entity_re = re.compile("(&\w+;)")
 num_entity_re = re.compile("(&#[0-9]+;)")
 
+
 def recode_entities(title, charset):
     output = []
     for part in entity_re.split(title):
@@ -95,6 +96,7 @@ def recode_entities(title, charset):
 import os
 BKMK_DEBUG_HTML_PARSERS = os.environ.get("BKMK_DEBUG_HTML_PARSERS")
 
+
 def parse_html(html_text, charset=None, log=None):
     if not parsers:
         return None
@@ -211,6 +213,7 @@ def parse_html(html_text, charset=None, log=None):
                 parser.icon = icon.encode(parser.charset)
     return parser
 
+
 def parse_filename(filename, charset=None, log=None):
     fp = open(filename, 'r')
     try:

diff --git a/parse_html/bkmk_ph_beautifulsoup.py b/parse_html/bkmk_ph_beautifulsoup.py
index 1479f034255c4c5b4e53b872ea5b0c157b4a74c6..e1969f3250aa73d6e46e24883dd264f6df7ccd94 100644 (file)
--- a/parse_html/bkmk_ph_beautifulsoup.py
+++ b/parse_html/bkmk_ph_beautifulsoup.py
@@ -19,6 +19,8 @@ from .bkmk_ph_util import HTMLParser
 DEFAULT_CHARSET = "cp1251"  # Stupid default for Russian Cyrillic
 
 # http://groups.google.com/group/beautifulsoup/browse_thread/thread/69093cb0d3a3cf63
+
+
 class BadDeclParser(BeautifulSoup):
     def parse_declaration(self, i):
         """Treat a bogus SGML declaration as raw data. Treat a CDATA
@@ -56,6 +58,7 @@ def _parse_html(html_text, charset):
     except TypeError:
         return None
 
+
 def parse_html(html_text, charset=None, log=None):
     root = _parse_html(html_text, charset)
     if root is None:
@@ -137,17 +140,21 @@ def parse_html(html_text, charset=None, log=None):
         return None
     return HTMLParser(_charset, meta_charset, title, refresh, icon)
 
+
 def _find_contenttype(Tag):
     return (Tag.name == "meta") and \
        (Tag.get("http-equiv", '').lower() == "content-type")
 
+
 def _find_charset(Tag):
     return (Tag.name == "meta") and Tag.get("charset", '')
 
+
 def _find_refresh(Tag):
     return (Tag.name == "meta") and \
        (Tag.get("http-equiv", '').lower() == "refresh")
 
+
 def _find_icon(Tag):
     return (Tag.name == "link") and \
        (Tag.get("rel", '').lower() in ('icon', 'shortcut icon'))

diff --git a/parse_html/bkmk_ph_beautifulsoup4.py b/parse_html/bkmk_ph_beautifulsoup4.py
index b7f60ffd12033f787d6c4e6973324456948dce68..182a123b402173d6a29c5e12d8971646541ba07f 100644 (file)
--- a/parse_html/bkmk_ph_beautifulsoup4.py
+++ b/parse_html/bkmk_ph_beautifulsoup4.py
@@ -18,12 +18,14 @@ from .bkmk_ph_util import HTMLParser
 universal_charset = "utf-8"
 DEFAULT_CHARSET = "cp1251"  # Stupid default for Russian Cyrillic
 
+
 def _parse_html(html_text, charset):
     try:
         return BeautifulSoup(html_text, from_encoding=charset)
     except TypeError:
         return None
 
+
 def parse_html(html_text, charset=None, log=None):
     root = _parse_html(html_text, charset)
     if root is None:
@@ -103,17 +105,21 @@ def parse_html(html_text, charset=None, log=None):
         return None
     return HTMLParser(_charset, meta_charset, title, refresh, icon)
 
+
 def _find_contenttype(Tag):
     return (Tag.name == "meta") and \
        (Tag.get_attribute_list("http-equiv", '')[0].lower() == "content-type")
 
+
 def _find_charset(Tag):
     return (Tag.name == "meta") and Tag.get("charset", '')
 
+
 def _find_refresh(Tag):
     return (Tag.name == "meta") and \
        (Tag.get_attribute_list("http-equiv", '')[0].lower() == "refresh")
 
+
 def _find_icon(Tag):
     return (Tag.name == "link") and \
        (Tag.get_attribute_list("rel", '')[0].lower() in ('icon', 'shortcut icon'))

diff --git a/parse_html/bkmk_ph_util.py b/parse_html/bkmk_ph_util.py
index 0e2d529a7ca2e4671f6599c5bd9bd2b8b4086468..0fd09f28fa0aa35712b90dc46fca447a2db7f8a6 100644 (file)
--- a/parse_html/bkmk_ph_util.py
+++ b/parse_html/bkmk_ph_util.py
@@ -4,7 +4,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['HTMLParser']
@@ -12,6 +12,7 @@ __all__ = ['HTMLParser']
 
 from HTMLParser import HTMLParser
 
+
 class HTMLParser(HTMLParser):
     def __init__(self, charset, meta_charset, title, refresh, icon):
         object.__init__(self)

diff --git a/robots.py b/robots.py
index 543e6ec783152c4caaeaaddba4f55bb71e78da76..2527a0c2192e7700cd3ed31acd9337a7d31d35d8 100644 (file)
--- a/robots.py
+++ b/robots.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 1997-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 1997-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['import_robot', 'robot']
@@ -16,6 +16,7 @@ from bkmk_objects import parse_params, set_params
 
 robot_name, robot_params = parse_params(environ.get("BKMK_ROBOT", "forking"))
 
+
 def import_robot(robot_name):
     exec("from Robots import bkmk_r%s" % robot_name)
     exec("robot = bkmk_r%s.robot_%s" % (robot_name, robot_name))

diff --git a/storage.py b/storage.py
index a71cdeb75af78896399d5746557c5a41840044a8..407fa24f1340c7ba5ea2eb1535b867ba0dbb6759 100644 (file)
--- a/storage.py
+++ b/storage.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 1997-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 1997-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['import_storage', 'storage']
@@ -16,6 +16,7 @@ from bkmk_objects import parse_params, set_params
 
 storage_name, storage_params = parse_params(environ.get("BKMK_STORAGE", "pickle"))
 
+
 def import_storage(storage_name):
     exec("from Storage import bkmk_st%s" % storage_name)
     exec("storage = bkmk_st%s.storage_%s" % (storage_name, storage_name))

diff --git a/writers.py b/writers.py
index 25c3cdb5afac49525f0051c383353ed937c240df..3212e5a157d9c0fa2030a356a2bc5d3ffc535f1f 100644 (file)
--- a/writers.py
+++ b/writers.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 1997-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 1997-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['import_writer', 'writer']
@@ -16,6 +16,7 @@ from bkmk_objects import parse_params, set_params
 
 writer_name, writer_params = parse_params(environ.get("BKMK_WRITER", "html"))
 
+
 def import_writer(writer_name):
     exec("from Writers import bkmk_w%s" % writer_name)
     exec("writer = bkmk_w%s.writer_%s" % (writer_name, writer_name))