Merge lp:~syleam/openobject-client/5.0-improve-timeout into lp:openobject-client/5.0

[Christophe CHAUVET]

=== modified file 'bin/options.py'
--- bin/options.py	2009-02-06 20:21:50 +0000
+++ bin/options.py	2009-03-02 19:41:45 +0000
@@ -102,6 +102,7 @@
             'client.filetype': {},
             'help.index': 'http://doc.openerp.com/',
             'help.context': 'http://doc.openerp.com/index.php?model=%(model)s&lang=%(lang)s',
+            'client.timeout': 300,
         }
         loglevels = ('critical', 'error', 'warning', 'info', 'debug', 'debug_rpc', 'debug_rpc_answer', 'notset')
         parser = optparse.OptionParser(version=_("OpenERP Client %s" % openerp_version))

=== modified file 'bin/tiny_socket.py'
--- bin/tiny_socket.py	2009-02-04 23:48:42 +0000
+++ bin/tiny_socket.py	2009-03-02 19:41:45 +0000
@@ -22,6 +22,7 @@
 import socket
 import cPickle
 import sys
+import options
 
 DNS_CACHE = {}
 
@@ -38,7 +39,7 @@
             socket.AF_INET, socket.SOCK_STREAM)
         else:
             self.sock = sock
-        self.sock.settimeout(120)
+        self.sock.settimeout(int(options.options['client.timeout']))
 
     def connect(self, host, port=False):
         if not port: