Merge remote-tracking branch 'upstream/master'

2014-12-24 16:57:15 +02:00 · 2014-12-24 16:57:15 +02:00 · 098b747d8b
parent 3941fd8ab5 32a6235f32
commit 098b747d8b
1 changed files with 1 additions and 1 deletions
--- a/pylast.py
+++ b/pylast.py
@ -1110,7 +1110,7 @@ class _Request(object):

        if self.network.is_proxy_enabled():
            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:
                conn.request(