jenkins-bot has submitted this change and it was merged.
Change subject: Provide correct instuctions on how to use a proxy
......................................................................
Provide correct instuctions on how to use a proxy
The instructions result in a console warning, which can be removed
by using 'del' after declaring the proxy.
httplib2 v0.7 and above include SocksiPy
Change-Id: Ib92fb5e1d0ca135d529566b7f4ea225d648acac7
---
M pywikibot/config2.py
1 file changed, 5 insertions(+), 9 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 18b9ca6..87883fe 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -587,15 +587,11 @@
# Proxy configuration
-# assign prox = None to connect directly
-# For proxy support first run: apt-get install python-socks.py
-# then change your user-config.py like:
-# import httplib2
-# import socks
-# proxy = httplib2.ProxyInfo(socks.PROXY_TYPE_HTTP, 'localhost', 8000)
-# The following lines will be printed, but it works:
-# Configuration variable 'httplib2' is defined but unknown. Misspelled?
-# Configuration variable 'socks' is defined but unknown. Misspelled?proxy = None
+# For proxy support, install socksipy or httplib2 0.7+
+# then add these three lines to your user-config.py:
+# from httplib2 import ProxyInfo, socks
+# proxy = ProxyInfo(socks.PROXY_TYPE_HTTP, 'localhost', 8000)
+# del ProxyInfo, socks
proxy = None
# Simulate settings
--
To view, visit
https://gerrit.wikimedia.org/r/137273
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib92fb5e1d0ca135d529566b7f4ea225d648acac7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>