From 1fdd59172b321fbebf34dc2f9d1b85ad449d42f7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 16 Apr 2015 17:12:41 +0200 Subject: Fix lib import --- pyload/remote/socketbackend/create_ttypes.py | 5 ----- pyload/remote/thriftbackend/ThriftClient.py | 12 ++---------- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'pyload/remote') 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 -- cgit v1.2.3