summaryrefslogtreecommitdiffstats
path: root/module/Api.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-04 13:39:42 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-04 13:39:42 +0100
commitd2e3afceb738af20aeb8e41f9aad12150cf1e8a7 (patch)
tree91a1ce5bc7fb51be6c3d188aed11552662d6f4bf /module/Api.py
parentclosed #440 (diff)
downloadpyload-d2e3afceb738af20aeb8e41f9aad12150cf1e8a7.tar.xz
Better download connection handling: Detect server error earlier, fallback to single connection if possible
Diffstat (limited to 'module/Api.py')
-rw-r--r--module/Api.py10
1 files changed, 7 insertions, 3 deletions
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 *