From: Oleg Broytman <phd@phdru.name>
Date: Sat, 29 Dec 2007 23:13:33 +0000 (+0000)
Subject: Log is always open.
X-Git-Tag: v4.5.3~227
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=9f0cf5475608f64848242072211aa64969098a01;p=bookmarks_db.git

Log is always open.


git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@149 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23
---

diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py
index c04026e..849078e 100644
--- a/Robots/bkmk_rforking.py
+++ b/Robots/bkmk_rforking.py
@@ -24,7 +24,7 @@ subp_pipe = None
 def stop_subp(log):
    global check_subp, subp_pipe
    if check_subp:
-      if log: log("   restarting hanging subprocess")
+      log("   restarting hanging subprocess")
       del check_subp
    del subp_pipe
 
diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py
index 14a3f58..2591588 100644
--- a/Robots/bkmk_rsimple.py
+++ b/Robots/bkmk_rsimple.py
@@ -150,10 +150,10 @@ class robot_simple(Robot):
                      content_type, charset = content_type.split(';')
                      content_type = content_type.strip()
                      charset = charset.split('=')[1].strip()
-                     if self.log: self.log("   HTTP charset   : %s" % charset)
+                     self.log("   HTTP charset   : %s" % charset)
                   except (ValueError, IndexError):
                      charset = None
-                     if self.log: self.log("   no charset in Content-Type header")
+                     self.log("   no charset in Content-Type header")
                   if content_type == "text/html":
                      parser = parse_html(fname, charset, self.log)
                      bookmark.real_title = parser.title
@@ -179,21 +179,21 @@ class robot_simple(Robot):
                      if not icon:
                         icon = "/favicon.ico"
                      icon = urljoin("%s://%s%s" % (url_type, url_host, url_path), icon)
-                     if self.log: self.log("   looking for icon at: %s" % icon)
+                     self.log("   looking for icon at: %s" % icon)
                      try:
                         for i in range(8):
                            try:
                               fname, headers = urllib.urlretrieve(icon)
                            except RedirectException, e:
                               icon = e.url
-                              if self.log: self.log("       redirect to : %s" % icon)
+                              self.log("       redirect to : %s" % icon)
                            else:
                               break
                         else:
                            raise IOError("Too many redirects")
                      except:
                         etype, emsg, tb = sys.exc_info()
-                        if self.log: self.log("   no icon        : %s %s" % (etype, emsg))
+                        self.log("   no icon        : %s %s" % (etype, emsg))
                         etype = None
                         emsg = None
                         tb = None
@@ -204,9 +204,9 @@ class robot_simple(Robot):
                            icon = icon_file.read()
                            icon_file.close()
                            bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon))
-                           if self.log: self.log("   got icon       : %s" % content_type)
+                           self.log("   got icon       : %s" % content_type)
                         else:
-                           if self.log: self.log("   no icon        : bad content type '%s'" % content_type)
+                           self.log("   no icon        : bad content type '%s'" % content_type)
                         os.remove(fname)
 
                except KeyError: