[Pywikipedia-l] SVN: [6039] branches/rewrite/pywikibot/comms/http.py

[russblau at svn.wikimedia.org]

Revision: 6039
Author:   russblau
Date:     2008-10-28 12:51:49 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
use default user-agent string only if user hasn't set one

Modified Paths:
--------------
    branches/rewrite/pywikibot/comms/http.py

Modified: branches/rewrite/pywikibot/comms/http.py
===================================================================
--- branches/rewrite/pywikibot/comms/http.py	2008-10-28 10:23:45 UTC (rev 6038)
+++ branches/rewrite/pywikibot/comms/http.py	2008-10-28 12:51:49 UTC (rev 6039)
@@ -90,7 +90,9 @@
     baseuri = "%s://%s/" % (site.protocol(), site.hostname())
     uri = urlparse.urljoin(baseuri, uri)
 
-    kwargs.setdefault("headers", {})['user-agent'] = useragent
+    # set default user-agent string
+    kwargs.setdefault("headers", {})
+    kwargs["headers"].setdefault("user-agent", useragent)
     request = threadedhttp.HttpRequest(uri, *args, **kwargs)
     http_queue.put(request)
     request.lock.acquire()