summaryrefslogtreecommitdiffstats
path: root/pyload/remote
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-16 17:12:41 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-16 17:12:41 +0200
commit1fdd59172b321fbebf34dc2f9d1b85ad449d42f7 (patch)
tree78895b14d1d3f9dfbb3de4a7f443c581e68d6cdb /pyload/remote
parentPlugins cleanup (diff)
downloadpyload-1fdd59172b321fbebf34dc2f9d1b85ad449d42f7.tar.xz
Fix lib import
Diffstat (limited to 'pyload/remote')
-rw-r--r--pyload/remote/socketbackend/create_ttypes.py5
-rw-r--r--pyload/remote/thriftbackend/ThriftClient.py12
2 files changed, 2 insertions, 15 deletions
diff --git a/pyload/remote/socketbackend/create_ttypes.py b/pyload/remote/socketbackend/create_ttypes.py
index 8c03b8576..72bc4c231 100644
--- a/pyload/remote/socketbackend/create_ttypes.py
+++ b/pyload/remote/socketbackend/create_ttypes.py
@@ -5,11 +5,6 @@ import os
import platform
import sys
-
-if "64" in platform.machine():
- sys.path.append(os.path.join(pypath, "lib64"))
-sys.path.append(os.path.join(pypath, "lib", "Python", "Lib"))
-
sys.path.append(os.path.join(pypath, "pyload", "remote"))
from pyload.remote.thriftbackend.thriftgen.pyload import ttypes
diff --git a/pyload/remote/thriftbackend/ThriftClient.py b/pyload/remote/thriftbackend/ThriftClient.py
index c779c9b9c..289762adc 100644
--- a/pyload/remote/thriftbackend/ThriftClient.py
+++ b/pyload/remote/thriftbackend/ThriftClient.py
@@ -1,19 +1,11 @@
# -*- coding: utf-8 -*-
import sys
+import thrift
+
from socket import error
from traceback import print_exc
-try:
- import thrift
-
-except ImportError:
- import platform
-
- if "64" in platform.machine():
- sys.path.append(os.path.join(pypath, "lib64"))
- sys.path.append(os.path.join(pypath, "lib", "Python", "Lib"))
-
from thrift.transport import TTransport
#from thrift.transport.TZlibTransport import TZlibTransport
from Socket import Socket