diff options
| -rw-r--r-- | module/remote/wsbackend/AsyncHandler.py | 3 | ||||
| -rw-r--r-- | pavement.py | 14 | ||||
| -rw-r--r-- | paver-minilib.zip | bin | 22 -> 26246 bytes | |||
| -rw-r--r-- | setup.py | 13 |
4 files changed, 24 insertions, 6 deletions
diff --git a/module/remote/wsbackend/AsyncHandler.py b/module/remote/wsbackend/AsyncHandler.py index d9e302fbb..158033ee8 100644 --- a/module/remote/wsbackend/AsyncHandler.py +++ b/module/remote/wsbackend/AsyncHandler.py @@ -78,6 +78,9 @@ class AsyncHandler(AbstractHandler): event = EventInfo(event, [x.toInfoData() if hasattr(x, 'toInfoData') else x for x in args]) for req in self.clients: + # Not logged in yet + if not req.api: continue + # filter events that these user is no owner of # TODO: events are security critical, this should be revised later # TODO: permissions? interaction etc diff --git a/pavement.py b/pavement.py index 22eed957c..484501fab 100644 --- a/pavement.py +++ b/pavement.py @@ -21,6 +21,7 @@ def new_fnmatch(self, pattern): else: return fnmatch.fnmatch(self.name, pattern) + path.fnmatch = new_fnmatch import sys @@ -59,7 +60,6 @@ setup( exclude_package_data={'pyload': ['docs*', 'scripts*', 'tests*']}, #exluced from build but not from sdist # 'bottle >= 0.10.0' not in list, because its small and contain little modifications install_requires=['pycurl', 'jinja2 >= 2.6', 'Beaker >= 1.6'] + extradeps, - tests_require=['websocket-client >= 0.8.0'], extras_require={ 'SSL': ["pyOpenSSL"], 'DLC': ['pycrypto'], @@ -68,6 +68,9 @@ setup( 'Few Hoster plugins': ['BeautifulSoup>=3.2, <3.3'] }, #setup_requires=["setuptools_hg"], + test_suite='nose.collector', + tests_require=['nose', 'websocket-client >= 0.8.0'], +# scripts=['pyload', 'pyload-cli'], entry_points={ 'console_scripts': [ 'pyload = pyload:main', @@ -116,6 +119,7 @@ options( xargs = ["--from-code=utf-8", "--copyright-holder=pyLoad Team", "--package-name=pyLoad", "--package-version=%s" % options.version, "--msgid-bugs-address='bugs@pyload.org'"] + @task @needs('cog') def html(): @@ -198,8 +202,10 @@ def apitypes(options): #create light ttypes from module.remote.create_apitypes import main + main() from module.remote.create_jstypes import main + main() @@ -250,9 +256,11 @@ def load_icons(): from glob import glob from shutil import copy + for f in glob("/tmp/fontawesome-webfont.*"): copy(f, PROJECT_DIR / "module" / "web" / "static" / "fonts") + @task def generate_locale(): """ Generates localisation files """ @@ -299,6 +307,10 @@ def tests(): @task +@cmdopts([ + ('virtual=', 'v', 'virtualenv path'), + ('python=', 'p', 'python path') +]) def virtualenv(options): """Setup virtual environment""" if path(options.dir).exists(): diff --git a/paver-minilib.zip b/paver-minilib.zip Binary files differindex 15cb0ecb3..1f8dc5631 100644 --- a/paver-minilib.zip +++ b/paver-minilib.zip @@ -1,7 +1,10 @@ -import os -if os.path.exists("paver-minilib.zip"): - import sys - sys.path.insert(0, "paver-minilib.zip") +try: + import paver.tasks +except ImportError: + from os.path import exists + if exists("paver-minilib.zip"): + import sys + sys.path.insert(0, "paver-minilib.zip") + import paver.tasks -import paver.tasks paver.tasks.main() |