-urllib._urlopener = MyURLopener()
-
-# Fake headers to pretend this is a real browser
-_user_agent = "Mozilla/5.0 (X11; U; Linux 2.6 i686; en) Gecko/20001221 Firefox/2.0.0"
-urllib._urlopener.addheaders[0] = ('User-Agent', _user_agent)
-_x_user_agent = "bookmarks_db (Python %d.%d.%d; urllib/%s)" % (
- sys.version_info[0], sys.version_info[1], sys.version_info[2], urllib.__version__)
-urllib._urlopener.addheader('X-User-Agent', _x_user_agent)
-urllib._urlopener.addheader('Referer', '')
+def add_headers(opener):
+ try:
+ _user_agent = request_headers.pop('User-Agent')
+ except KeyError:
+ pass
+ else:
+ opener.addheaders[0] = ('User-Agent', _user_agent)
+ for h, v in request_headers.items():
+ opener.addheader(h, v)