diff options
-rw-r--r-- | pyload/api/__init__.py | 12 | ||||
-rw-r--r-- | pyload/config/Parser.py | 2 | ||||
-rw-r--r-- | pyload/database/UserDatabase.py | 4 | ||||
-rw-r--r-- | pyload/database/__init__.py | 9 | ||||
-rw-r--r-- | pyload/network/Browser.py | 4 | ||||
-rw-r--r-- | pyload/network/HTTPChunk.py | 2 | ||||
-rw-r--r-- | pyload/network/HTTPDownload.py | 4 | ||||
-rw-r--r-- | pyload/network/RequestFactory.py | 10 | ||||
-rw-r--r-- | pyload/remote/ThriftBackend.py | 10 | ||||
-rw-r--r-- | pyload/remote/socketbackend/create_ttypes.py | 4 | ||||
-rw-r--r-- | pyload/remote/thriftbackend/Processor.py | 2 | ||||
-rw-r--r-- | pyload/remote/thriftbackend/ThriftClient.py | 4 | ||||
-rw-r--r-- | pyload/remote/thriftbackend/ThriftTest.py | 4 | ||||
-rw-r--r-- | pyload/webui/app/api.py | 2 | ||||
-rw-r--r-- | pyload/webui/app/json.py | 2 | ||||
-rw-r--r-- | pyload/webui/app/pyload.py | 2 |
16 files changed, 38 insertions, 39 deletions
diff --git a/pyload/api/__init__.py b/pyload/api/__init__.py index 223b48b0a..ab410bbc6 100644 --- a/pyload/api/__init__.py +++ b/pyload/api/__init__.py @@ -10,15 +10,15 @@ from urlparse import urlparse from pyload.datatype.PyFile import PyFile from pyload.utils.packagetools import parseNames -from network.RequestFactory import getURL -from remote import activated -from utils import compare_time, freeSpace, html_unescape, save_filename +from pyload.network.RequestFactory import getURL +from pyload.remote import activated +from pyload.utils import compare_time, freeSpace, html_unescape, save_filename if activated: try: - from lib.thrift.protocol import TBase - from remote.thriftbackend.thriftgen.pyload.ttypes import * - from remote.thriftbackend.thriftgen.pyload.Pyload import Iface + from thrift.protocol import TBase + from pyload.remote.thriftbackend.thriftgen.pyload.ttypes import * + from pyload.remote.thriftbackend.thriftgen.pyload.Pyload import Iface BaseObject = TBase diff --git a/pyload/config/Parser.py b/pyload/config/Parser.py index 65e15ca85..ed9f1f897 100644 --- a/pyload/config/Parser.py +++ b/pyload/config/Parser.py @@ -7,7 +7,7 @@ from os.path import exists, join from shutil import copy from traceback import print_exc -from utils import chmod, encode, decode +from pyload.utils import chmod, encode, decode CONF_VERSION = 1 diff --git a/pyload/database/UserDatabase.py b/pyload/database/UserDatabase.py index 7e89d7df4..67cb62ab9 100644 --- a/pyload/database/UserDatabase.py +++ b/pyload/database/UserDatabase.py @@ -4,8 +4,8 @@ from hashlib import sha1 import random -from DatabaseBackend import DatabaseBackend -from DatabaseBackend import style +from pyload.database.DatabaseBackend import DatabaseBackend +from pyload.database.DatabaseBackend import style class UserMethods(object): @style.queue diff --git a/pyload/database/__init__.py b/pyload/database/__init__.py index 5f287a47f..5c6658f01 100644 --- a/pyload/database/__init__.py +++ b/pyload/database/__init__.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- -from DatabaseBackend import DatabaseBackend -from DatabaseBackend import style +from pyload.database.DatabaseBackend import DatabaseBackend, style -from FileDatabase import FileHandler -from UserDatabase import UserMethods -from StorageDatabase import StorageMethods +from pyload.database.FileDatabase import FileHandler +from pyload.database.UserDatabase import UserMethods +from pyload.database.StorageDatabase import StorageMethods diff --git a/pyload/network/Browser.py b/pyload/network/Browser.py index e78d24688..89341ff25 100644 --- a/pyload/network/Browser.py +++ b/pyload/network/Browser.py @@ -2,8 +2,8 @@ from logging import getLogger -from HTTPRequest import HTTPRequest -from HTTPDownload import HTTPDownload +from pyload.network.HTTPRequest import HTTPRequest +from pyload.network.HTTPDownload import HTTPDownload class Browser(object): diff --git a/pyload/network/HTTPChunk.py b/pyload/network/HTTPChunk.py index 3312d10d6..41752b940 100644 --- a/pyload/network/HTTPChunk.py +++ b/pyload/network/HTTPChunk.py @@ -10,7 +10,7 @@ import codecs import pycurl import urllib -from HTTPRequest import HTTPRequest +from pyload.network.HTTPRequest import HTTPRequest class WrongFormat(Exception): pass diff --git a/pyload/network/HTTPDownload.py b/pyload/network/HTTPDownload.py index 559806459..270e81795 100644 --- a/pyload/network/HTTPDownload.py +++ b/pyload/network/HTTPDownload.py @@ -9,8 +9,8 @@ from logging import getLogger import pycurl -from HTTPChunk import ChunkInfo, HTTPChunk -from HTTPRequest import BadHeader +from pyload.network.HTTPChunk import ChunkInfo, HTTPChunk +from pyload.network.HTTPRequest import BadHeader from pyload.plugins.Plugin import Abort from pyload.utils import safe_join, fs_encode diff --git a/pyload/network/RequestFactory.py b/pyload/network/RequestFactory.py index fd3ca21fe..579eafea7 100644 --- a/pyload/network/RequestFactory.py +++ b/pyload/network/RequestFactory.py @@ -3,12 +3,12 @@ from threading import Lock -from Browser import Browser -from Bucket import Bucket -from HTTPRequest import HTTPRequest -from CookieJar import CookieJar +from pyload.network.Browser import Browser +from pyload.network.Bucket import Bucket +from pyload.network.HTTPRequest import HTTPRequest +from pyload.network.CookieJar import CookieJar -from XDCCRequest import XDCCRequest +from pyload.network.XDCCRequest import XDCCRequest class RequestFactory(object): def __init__(self, core): diff --git a/pyload/remote/ThriftBackend.py b/pyload/remote/ThriftBackend.py index 7c76c4231..2b46e25c0 100644 --- a/pyload/remote/ThriftBackend.py +++ b/pyload/remote/ThriftBackend.py @@ -5,11 +5,11 @@ from os.path import exists from pyload.manager.RemoteManager import BackendBase -from thriftbackend.Processor import Processor -from thriftbackend.Protocol import ProtocolFactory -from thriftbackend.Socket import ServerSocket -from thriftbackend.Transport import TransportFactory -#from thriftbackend.Transport import TransportFactoryCompressed +from pyload.remote.thriftbackend.Processor import Processor +from pyload.remote.thriftbackend.Protocol import ProtocolFactory +from pyload.remote.thriftbackend.Socket import ServerSocket +from pyload.remote.thriftbackend.Transport import TransportFactory +#from pyload.remote.thriftbackend.Transport import TransportFactoryCompressed from thrift.server import TServer diff --git a/pyload/remote/socketbackend/create_ttypes.py b/pyload/remote/socketbackend/create_ttypes.py index be1e2aaea..cf357bd53 100644 --- a/pyload/remote/socketbackend/create_ttypes.py +++ b/pyload/remote/socketbackend/create_ttypes.py @@ -7,8 +7,8 @@ from os.path import abspath, dirname, join sys.path.append(join(pypath, "pyload", "lib")) sys.path.append(join(pypath, "pyload", "remote")) -from thriftbackend.thriftgen.pyload import ttypes -from thriftbackend.thriftgen.pyload.Pyload import Iface +from pyload.remote.thriftbackend.thriftgen.pyload import ttypes +from pyload.remote.thriftbackend.thriftgen.pyload.Pyload import Iface def main(): diff --git a/pyload/remote/thriftbackend/Processor.py b/pyload/remote/thriftbackend/Processor.py index a8b87c82c..683697d1c 100644 --- a/pyload/remote/thriftbackend/Processor.py +++ b/pyload/remote/thriftbackend/Processor.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from thriftgen.pyload import Pyload +from pyload.remote.thriftbackend.thriftgen.pyload import Pyload class Processor(Pyload.Processor): def __init__(self, *args, **kwargs): diff --git a/pyload/remote/thriftbackend/ThriftClient.py b/pyload/remote/thriftbackend/ThriftClient.py index d7b0d2919..d5159320e 100644 --- a/pyload/remote/thriftbackend/ThriftClient.py +++ b/pyload/remote/thriftbackend/ThriftClient.py @@ -17,8 +17,8 @@ from Protocol import Protocol # modules should import ttypes from here, when want to avoid importing API -from thriftgen.pyload import Pyload -from thriftgen.pyload.ttypes import * +from pyload.remote.thriftbackend.thriftgen.pyload import Pyload +from pyload.remote.thriftbackend.thriftgen.pyload.ttypes import * ConnectionClosed = TTransport.TTransportException diff --git a/pyload/remote/thriftbackend/ThriftTest.py b/pyload/remote/thriftbackend/ThriftTest.py index 7243cc6f2..05c6ba40e 100644 --- a/pyload/remote/thriftbackend/ThriftTest.py +++ b/pyload/remote/thriftbackend/ThriftTest.py @@ -6,8 +6,8 @@ from os.path import join, abspath, dirname path = join((abspath(dirname(__file__))), "..", "..", "lib") sys.path.append(path) -from thriftgen.pyload import Pyload -from thriftgen.pyload.ttypes import * +from pyload.remote.thriftbackend.thriftgen.pyload import Pyload +from pyload.remote.thriftbackend.thriftgen.pyload.ttypes import * from Socket import Socket from thrift import Thrift diff --git a/pyload/webui/app/api.py b/pyload/webui/app/api.py index 9726902fb..1ee4b1608 100644 --- a/pyload/webui/app/api.py +++ b/pyload/webui/app/api.py @@ -6,7 +6,7 @@ from traceback import format_exc, print_exc from bottle import route, request, response, HTTPError -from utils import toDict, set_session +from pyload.utils import toDict, set_session from pyload.webui import PYLOAD from pyload.utils import json diff --git a/pyload/webui/app/json.py b/pyload/webui/app/json.py index 096f72ab5..c347c25e3 100644 --- a/pyload/webui/app/json.py +++ b/pyload/webui/app/json.py @@ -8,7 +8,7 @@ from bottle import route, request, HTTPError from pyload.webui import PYLOAD -from utils import login_required, render_to_response, toDict +from pyload.utils import login_required, render_to_response, toDict from pyload.utils import decode, formatSize diff --git a/pyload/webui/app/pyload.py b/pyload/webui/app/pyload.py index c5c6c80cd..ccd2c30f0 100644 --- a/pyload/webui/app/pyload.py +++ b/pyload/webui/app/pyload.py @@ -16,7 +16,7 @@ from bottle import route, static_file, request, response, redirect, error from pyload.webui import PYLOAD, PYLOAD_DIR, THEME_DIR, SETUP, env -from utils import render_to_response, parse_permissions, parse_userdata, \ +from pyload.utils import render_to_response, parse_permissions, parse_userdata, \ login_required, get_permission, set_permission, permlist, toDict, set_session from pyload.webui.filters import relpath, unquotepath |