tAdd fallback for users who ran master with the old default config - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8833555b35b49fe3b62539692e0b6c8950c0e31f
DIR parent a27fba8685fa432b11e265a327643f2b12845ccb
HTML Author: Maran <maran.hidskes@gmail.com>
Date: Tue, 9 Oct 2012 17:13:26 +0200
Add fallback for users who ran master with the old default config
Diffstat:
M lib/interface.py | 9 +++++++++
1 file changed, 9 insertions(+), 0 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -22,6 +22,7 @@ import threading, traceback, sys, time, json, Queue
from version import ELECTRUM_VERSION
from util import print_error
+from simple_config import SimpleConfig
DEFAULT_TIMEOUT = 5
DEFAULT_SERVERS = [ 'electrum.novit.ro:50001:t',
t@@ -189,9 +190,17 @@ class HttpStratumInterface(PollingInterface):
import urllib2, json, time, cookielib
if self.proxy:
+ # This is a friendly fallback to the old style default proxy options
+ if(self.proxy["mode"] == "none"):
+ simple_config = SimpleConfig()
+ simple_config.set_key("proxy", None, True)
+ return
+
import socks
+
socks.setdefaultproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) )
socks.wrapmodule(urllib2)
+
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
urllib2.install_opener(opener)