From d2e3afceb738af20aeb8e41f9aad12150cf1e8a7 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sun, 4 Dec 2011 13:39:42 +0100
Subject: Better download connection handling: Detect server error earlier,
fallback to single connection if possible
---
module/Api.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
(limited to 'module/Api.py')
diff --git a/module/Api.py b/module/Api.py
index ba79a31ef..fc36c9fea 100644
--- a/module/Api.py
+++ b/module/Api.py
@@ -29,9 +29,13 @@ from network.RequestFactory import getURL
from remote import activated
if activated:
- from remote.thriftbackend.thriftgen.pyload.ttypes import *
- from remote.thriftbackend.thriftgen.pyload.Pyload import Iface
- BaseObject = TBase
+ try:
+ from remote.thriftbackend.thriftgen.pyload.ttypes import *
+ from remote.thriftbackend.thriftgen.pyload.Pyload import Iface
+ BaseObject = TBase
+ except ImportError:
+ print "Thrift not imported"
+ from remote.socketbackend.ttypes import *
else:
from remote.socketbackend.ttypes import *
--
cgit v1.2.3