X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=check_urls.py;h=a666ea03d2762ca87647c7b75960d2574f92f7d5;hb=bc56d4dc2445573da5ff95d232681bf2c0f7b732;hp=000141ff0f65929fb525879e9c2f6ffcff46745d;hpb=a5a3a03d6067edaae395c8d5386257b55f3850f3;p=bookmarks_db.git diff --git a/check_urls.py b/check_urls.py index 000141f..a666ea0 100755 --- a/check_urls.py +++ b/check_urls.py @@ -1,11 +1,11 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 """Robot interface - check URLs from bookmarks database This file is a part of Bookmarks database and Internet robot. """ from __future__ import print_function -import sys, os +import sys __author__ = "Oleg Broytman " @@ -61,6 +61,7 @@ def run(): log("check_urls started") if report_stats: print(" check_urls: normal start") + log.outfile.reconfigure(encoding='utf-8') from storage import storage storage = storage() @@ -107,8 +108,8 @@ def run(): if object.isBookmark: href = object.href - if (href.startswith('place:') # Firefox SmartBookmarks - or '%s' in href): # Bookmark with keyword + if (href.startswith('place:') # Firefox SmartBookmarks + or '%s' in href): # Bookmark with keyword log("Skipped %s" % href) continue @@ -118,7 +119,7 @@ def run(): else: continue - if checked.has_key(href): + if href in checked: log("Already checked %s" % href) old_object = root_folder.linear[checked[href]] for attr_name in ( @@ -127,7 +128,8 @@ def run(): "last_tested", "test_time", "icon", "charset", ): if hasattr(old_object, attr_name): - setattr(object, attr_name, getattr(old_object, attr_name)) + setattr(object, attr_name, + getattr(old_object, attr_name)) else: log("Checking %s" % href) rcode = robot.check_url(object) @@ -138,7 +140,7 @@ def run(): try: size = size + int(object.size) except (AttributeError, TypeError, ValueError): - pass # Some object does not have a size :( + pass # Some object does not have a size :( else: log("Interrupted by user (^C)") break