From a383223e02e0d3932ed397e5eeee4fde9e9e628d Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 7 Dec 2010 16:48:49 +0900 Subject: [PATCH] provide more info in sync error messages; catch zlib decode errors --- anki/sync.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/anki/sync.py b/anki/sync.py index ff45c64cb..21cac830e 100644 --- a/anki/sync.py +++ b/anki/sync.py @@ -1143,12 +1143,17 @@ class HttpSyncServerProxy(SyncServer): try: f = urllib2.urlopen(SYNC_URL + action, data) except (urllib2.URLError, socket.error, socket.timeout, - httplib.BadStatusLine): - raise SyncError(type="noResponse") + httplib.BadStatusLine), e: + raise SyncError(type="connectionError", + exc=`e`) ret = f.read() if not ret: raise SyncError(type="noResponse") - return self.unstuff(ret) + try: + return self.unstuff(ret) + except Exception, e: + raise SyncError(type="connectionError", + exc=`e`) # HTTP server: respond to proxy requests and return data ##########################################################################