diff options
| author | Simon Schampijer <simon@schampijer.de> | 2011-06-09 12:31:54 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2011-06-09 12:36:32 (GMT) |
| commit | df9c0aeb9f064282a566bac7a26240066fe2291f (patch) | |
| tree | bb2227fe96414605402b53cc4efc6aa7d90cf2ad | |
| parent | 21bf1426be09498591e7f65895f18460dc30ae0c (diff) | |
Register with schoolserver: adopt to changes in xmlrpclib for python 2.7 OLPC #10776, SL #2726
Python 2.7 switched from using httplib.HTTP to using httplib.HTTPConnection,
as the httplib.HTTPConnection includes a timeout by default we can use a
xmlrpclib.Transport directly and do not need to subclass it.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
| -rw-r--r-- | src/jarabe/desktop/schoolserver.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py index aea2357..634817b 100644 --- a/src/jarabe/desktop/schoolserver.py +++ b/src/jarabe/desktop/schoolserver.py @@ -24,6 +24,7 @@ from string import ascii_uppercase import random import time import uuid +import sys import gconf @@ -123,12 +124,18 @@ def register_laptop(url=_REGISTER_URL): nick = client.get_string('/desktop/sugar/user/nick') - server = xmlrpclib.ServerProxy(url, _TimeoutTransport()) + if sys.hexversion < 0x2070000: + server = xmlrpclib.ServerProxy(url, _TimeoutTransport()) + else: + socket.setdefaulttimeout(_REGISTER_TIMEOUT) + server = xmlrpclib.ServerProxy(url) try: data = server.register(sn, nick, uuid_, profile.pubkey) except (xmlrpclib.Error, TypeError, socket.error): logging.exception('Registration: cannot connect to server') raise RegisterError(_('Cannot connect to the server.')) + finally: + socket.setdefaulttimeout(None) if data['success'] != 'OK': logging.error('Registration: server could not complete request: %s', |