Combined user agent definition in one place.

isagalaev · Jul 18, 2014 · 9fb1ad3 · 9fb1ad3
1 parent 59c63d4
commit 9fb1ad3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/openid/fetchers.py b/openid/fetchers.py
@@ -15,7 +15,11 @@
 import openid
 
 
-USER_AGENT = "python-openid/%s (%s)" % (openid.__version__, sys.platform)
+USER_AGENT = 'python-openid/%s (%s) Python-urllib/%s' % (
+    openid.__version__,
+    sys.platform,
+    urllib.request.__version__,
+)
 MAX_RESPONSE_KB = 1024
 
 
@@ -38,10 +42,7 @@ def fetch(url, body=None, headers=None):
 
     if headers is None:
         headers = {}
-
-    headers.setdefault(
-        'User-Agent',
-        "%s Python-urllib/%s" % (USER_AGENT, urllib.request.__version__))
+    headers.setdefault('User-Agent', USER_AGENT)
 
     request = urllib.request.Request(url, data=body, headers=headers)
     f = urllib.request.urlopen(request)