diff --git a/eos b/eos index 2d9bb053e..7afaf9fb1 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 2d9bb053ea3f7d32a4321107ce0cbb28ef025f7a +Subproject commit 7afaf9fb119ef736cfea63a69c613889b7980058 diff --git a/service/market.py b/service/market.py index cb57232e2..e0677903e 100644 --- a/service/market.py +++ b/service/market.py @@ -26,7 +26,7 @@ import Queue import eos.db import eos.types -from service.settings import SettingsProvider +from service.settings import SettingsProvider, ProxySettings try: from collections import OrderedDict @@ -79,7 +79,11 @@ class PriceWorkerThread(threading.Thread): # Grab prices, this is the time-consuming part if len(requests) > 0: - eos.types.Price.fetchPrices(*requests) + proxy = ProxySettings.getInstance().getProxySettings() + if proxy is not None: + proxy = "{0}:{1}".format(*proxy) + print proxy + eos.types.Price.fetchPrices(requests, proxy=proxy) wx.CallAfter(callback) queue.task_done()