saper has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/208842

Change subject: Allow user to customize User-Agent
......................................................................

Allow user to customize User-Agent

Due to problems with automatic
version detection (WindowsError,
not working without $PATH under
cron, etc.) allow the user
to override default user agent.

Change-Id: I47a8f135336f3dec4cea46f846e2db1567868d24
---
M config.py
M wikipedia.py
2 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/42/208842/1

diff --git a/config.py b/config.py
index 19f8369..84968b9 100644
--- a/config.py
+++ b/config.py
@@ -435,6 +435,7 @@
 ############## HTTP SETTINGS ##############
 # Default socket timeout. Set to None to disable timeouts.
 socket_timeout = 120  # set a pretty long timeout just in case...
+useragent = None
 
 
 ############## COSMETIC CHANGES SETTINGS ##############
diff --git a/wikipedia.py b/wikipedia.py
index 3f3496a..9873e40 100644
--- a/wikipedia.py
+++ b/wikipedia.py
@@ -6057,10 +6057,13 @@
     useragent = s
 
 # Default User-agent
-setUserAgent(USER_AGENT_FORMAT % dict(
-    script=('-'.join(version.get_executing_script())),
-    versionrev=(version.getversiondict()["rev"])
-))
+if config.useragent:
+    useragent = config.useragent
+else:
+    setUserAgent(USER_AGENT_FORMAT % dict(
+        script=('-'.join(version.get_executing_script())),
+        versionrev=(version.getversiondict()["rev"])
+    ))
 
 
 def url2link(percentname, insite, site):

-- 
To view, visit https://gerrit.wikimedia.org/r/208842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47a8f135336f3dec4cea46f846e2db1567868d24
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: saper <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to