X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rurllib2.py;h=66f04600135d648b281e52952a3e53c84d44bc22;hb=22ff22eb1b087f197008ceaf926d952b226f07bf;hp=4cb684bae94fbc642f9af0a4594783f15fab3be8;hpb=9faa13f6f8199790cf01533e857c593520559649;p=bookmarks_db.git diff --git a/Robots/bkmk_rurllib2.py b/Robots/bkmk_rurllib2.py index 4cb684b..66f0460 100644 --- a/Robots/bkmk_rurllib2.py +++ b/Robots/bkmk_rurllib2.py @@ -40,7 +40,8 @@ urllib2.install_opener(opener) # Fake headers to pretend this is a real browser -_user_agent = "Mozilla/5.0 (X11; Linux i686; rv:30.0) Gecko/20100101 Firefox/30.0" +_user_agent = "Mozilla/5.0 (X11; Linux i686; rv:30.0)" +" Gecko/20100101 Firefox/30.0" _x_user_agent = "bookmarks_db (Python %d.%d.%d; urllib2)" % ( sys.version_info[0], sys.version_info[1], sys.version_info[2]) @@ -69,7 +70,8 @@ class robot_urllib2(robot_base): return None, e.code, e.hdrs['Location'], None, None else: self.log(' HTTP Error %s: %s' % (e.code, e.msg)) - return "HTTP Error %s: %s" % (e.code, e.msg), None, None, None, None + return ("HTTP Error %s: %s" % (e.code, e.msg), + None, None, None, None) except urllib2.URLError as e: self.log(' URL Error: %s' % e.reason)