Merge remote-tracking branch 'upstream/master'

This commit is contained in:
hugovk 2014-12-24 16:57:15 +02:00
commit 098b747d8b

View file

@ -1110,7 +1110,7 @@ class _Request(object):
if self.network.is_proxy_enabled(): if self.network.is_proxy_enabled():
conn = HTTPConnection( conn = HTTPConnection(
host=self._get_proxy()[0], port=self._get_proxy()[1]) host=self.network._get_proxy()[0], port=self.network._get_proxy()[1])
try: try:
conn.request( conn.request(