summaryrefslogtreecommitdiffstats
path: root/module/Api.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-09-21 23:27:12 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-09-21 23:27:12 +0200
commit7007ebe7710d29f26696de16407beced6dbacb6c (patch)
treec2bebbe1fc243fae6622804f708c6e2c87408ca4 /module/Api.py
parentmerge newest changes (diff)
downloadpyload-7007ebe7710d29f26696de16407beced6dbacb6c.tar.xz
added websocket backend, removed thrift
Diffstat (limited to 'module/Api.py')
-rw-r--r--module/Api.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/module/Api.py b/module/Api.py
index dec1526b2..cfe1815c1 100644
--- a/module/Api.py
+++ b/module/Api.py
@@ -23,19 +23,7 @@ from functools import partial
from new import code
from dis import opmap
-from remote import activated
-
-if activated:
- 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 *
+from remote.ttypes import *
from datatypes.PyFile import PyFile
from utils import compare_time, to_string, bits_set, get_index