diff options
author | RaNaN <Mast3rRaNaN@hotmail.de> | 2012-09-21 23:27:12 +0200 |
---|---|---|
committer | RaNaN <Mast3rRaNaN@hotmail.de> | 2012-09-21 23:27:12 +0200 |
commit | 7007ebe7710d29f26696de16407beced6dbacb6c (patch) | |
tree | c2bebbe1fc243fae6622804f708c6e2c87408ca4 /module/Api.py | |
parent | merge newest changes (diff) | |
download | pyload-7007ebe7710d29f26696de16407beced6dbacb6c.tar.xz |
added websocket backend, removed thrift
Diffstat (limited to 'module/Api.py')
-rw-r--r-- | module/Api.py | 14 |
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 |