diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-06-10 20:43:42 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-06-10 20:43:42 +0200 |
| commit | 5ede83fde874c47123616f8d36cbcf36d92bdbf9 (patch) | |
| tree | 16450589b2051aa2013f505ae10dfac9a6cf56d7 /pyload | |
| parent | fixed start scripts (diff) | |
| download | pyload-5ede83fde874c47123616f8d36cbcf36d92bdbf9.tar.xz | |
separated setup and paver
Diffstat (limited to 'pyload')
| -rw-r--r-- | pyload/Core.py | 10 | ||||
| -rw-r--r-- | pyload/InitHomeDir.py | 1 | ||||
| -rw-r--r-- | pyload/__init__.py | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/pyload/Core.py b/pyload/Core.py index 16740bafa..15b036c7a 100644 --- a/pyload/Core.py +++ b/pyload/Core.py @@ -19,11 +19,10 @@ # @version: v0.5.0 ############################################################################### -CURRENT_VERSION = '0.4.9.9-dev' +from pyload import __version__ as CURRENT_VERSION import __builtin__ - from getopt import getopt, GetoptError import logging import logging.handlers @@ -42,6 +41,7 @@ import subprocess subprocess.__doc__ = None # the module with the largest doc we are using import InitHomeDir + from AccountManager import AccountManager from config.ConfigParser import ConfigParser from config.ConfigManager import ConfigManager @@ -645,7 +645,7 @@ def deamon(): pyload_core = Core() pyload_core.start() - +# And so it begins... def main(): #change name to 'pyLoadCore' #from module.lib.rename_process import renameProcess @@ -662,6 +662,6 @@ def main(): pyload_core.removeLogger() _exit(1) -# And so it begins... + if __name__ == "__main__": - main()
\ No newline at end of file + print "This file can not be started directly."
\ No newline at end of file diff --git a/pyload/InitHomeDir.py b/pyload/InitHomeDir.py index c255913de..d24837d83 100644 --- a/pyload/InitHomeDir.py +++ b/pyload/InitHomeDir.py @@ -36,7 +36,6 @@ if 'pyload' in sys.modules: if abs_pyload != rel_pyload: sys.modules['pyload'].__path__.insert(0, abs_pyload) - sys.path.append(join(pypath, "pyload", "lib")) homedir = "" diff --git a/pyload/__init__.py b/pyload/__init__.py index e69de29bb..b72ac12e9 100644 --- a/pyload/__init__.py +++ b/pyload/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +__version_info__ = ('0', '4', '9', '9') +__version__ = '.'.join(__version_info__) + "-dev"
\ No newline at end of file |