Consolidating timeout location and increasing it for slower connections

git-svn-id: file:///svnroot/gc-dialer/trunk@231 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/browser_emu.py b/src/browser_emu.py
index 3083a1c..7e7c004 100644 (file)
--- a/src/browser_emu.py
+++ b/src/browser_emu.py
@@ -32,6 +32,11 @@ import urllib2
 import cookielib
 import warnings
 
+import socket
+
+
+socket.setdefaulttimeout(10)
+
 
 class MozillaEmulator(object):
 

diff --git a/src/gc_backend.py b/src/gc_backend.py
index 7afcde5..87797ae 100644 (file)
--- a/src/gc_backend.py
+++ b/src/gc_backend.py
@@ -32,11 +32,6 @@ import traceback
 
 from browser_emu import MozillaEmulator
 
-import socket
-
-
-socket.setdefaulttimeout(5)
-
 
 class GCDialer(object):
        """

diff --git a/src/gv_backend.py b/src/gv_backend.py
index a6efd77..c90e584 100644 (file)
--- a/src/gv_backend.py
+++ b/src/gv_backend.py
@@ -38,15 +38,11 @@ from xml.etree import ElementTree
 
 from browser_emu import MozillaEmulator
 
-import socket
-
 try:
        import simplejson
 except ImportError:
        simplejson = None
 
-socket.setdefaulttimeout(5)
-
 
 _TRUE_REGEX = re.compile("true")
 _FALSE_REGEX = re.compile("false")