From 7007ebe7710d29f26696de16407beced6dbacb6c Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Fri, 21 Sep 2012 23:27:12 +0200
Subject: added websocket backend, removed thrift

---
 module/Api.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'module/Api.py')

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
-- 
cgit v1.2.3