Update conf.py

This commit is contained in:
Junaid Loonat 2016-04-25 22:03:00 +02:00
parent 8d2da9aa3a
commit 14e5c490e6

View File

@ -38,6 +38,10 @@ from .utils import minisix
from .version import version from .version import version
from .i18n import PluginInternationalization from .i18n import PluginInternationalization
_ = PluginInternationalization() _ = PluginInternationalization()
if minisix.PY2:
from urllib2 import build_opener, install_opener, ProxyHandler
else:
from urllib.request import build_opener, install_opener, ProxyHandler
### ###
# *** The following variables are affected by command-line options. They are # *** The following variables are affected by command-line options. They are
@ -1173,10 +1177,6 @@ registerGlobalValue(supybot.protocols.http, 'peekSize',
class HttpProxy(registry.String): class HttpProxy(registry.String):
"""Value must be a valid hostname:port string.""" """Value must be a valid hostname:port string."""
def setValue(self, v): def setValue(self, v):
if minisix.PY2:
from urllib2 import build_opener, install_opener, ProxyHandler
else:
from urllib.request import build_opener, install_opener, ProxyHandler
proxies = {} proxies = {}
if v != "": if v != "":
# TODO: improve checks # TODO: improve checks