diff --git a/ctl b/ctl index 28c74e12..b518cddd 100755 --- a/ctl +++ b/ctl @@ -10,7 +10,6 @@ self=`readlink "$0"` if [ -z $self ]; then self="$0" fi - if [ "$action" = "init" ]; then cd "`dirname "$self"`" BASE=`pwd` @@ -48,15 +47,7 @@ if [ "$action" = "init" ]; then fi exit 0 fi - if [ "$action" = "manage" ]; then - cmd="pandora/manage.py" -fi -if [ "$action" = "update" ]; then - cmd="update.py" -fi - -if [ ! -z $cmd ]; then cd "`dirname "$self"`" BASE=`pwd` SUDO="" @@ -65,10 +56,9 @@ if [ ! -z $cmd ]; then SUDO="sudo -H -u $PANDORA_USER" fi shift - $SUDO "$BASE/$cmd" $@ + $SUDO $BASE/pandora/manage.py $@ exit $? fi - if [ `whoami` != 'root' ]; then echo you have to be root or run $0 with sudo exit 1 diff --git a/pandora/app/utils.py b/pandora/app/utils.py index ee2e9d08..f272e6c8 100644 --- a/pandora/app/utils.py +++ b/pandora/app/utils.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import division, with_statement + import time from .models import Settings diff --git a/pandora/archive/chunk.py b/pandora/archive/chunk.py index 8422051e..148ba24f 100644 --- a/pandora/archive/chunk.py +++ b/pandora/archive/chunk.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import division, with_statement + import os import ox diff --git a/pandora/home/apps.py b/pandora/home/apps.py index 90dc7137..1d6cbbdf 100644 --- a/pandora/home/apps.py +++ b/pandora/home/apps.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/pandora/item/data_api.py b/pandora/item/data_api.py index 0c06015f..81d9d72c 100644 --- a/pandora/item/data_api.py +++ b/pandora/item/data_api.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import division, with_statement + import ox from django.conf import settings diff --git a/pandora/oxdjango/api/__init__.py b/pandora/oxdjango/api/__init__.py index 72294dc6..4ecadf1d 100644 --- a/pandora/oxdjango/api/__init__.py +++ b/pandora/oxdjango/api/__init__.py @@ -1 +1,3 @@ +from __future__ import absolute_import + from .actions import actions diff --git a/pandora/oxdjango/api/actions.py b/pandora/oxdjango/api/actions.py index 70249914..f8a91d3a 100644 --- a/pandora/oxdjango/api/actions.py +++ b/pandora/oxdjango/api/actions.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import division, absolute_import + import inspect import sys diff --git a/pandora/oxdjango/api/site.py b/pandora/oxdjango/api/site.py index cac1e021..ddd5bc49 100644 --- a/pandora/oxdjango/api/site.py +++ b/pandora/oxdjango/api/site.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import + from django.urls import path from . import views diff --git a/pandora/oxdjango/api/views.py b/pandora/oxdjango/api/views.py index 3a4a2e89..1dfe7428 100644 --- a/pandora/oxdjango/api/views.py +++ b/pandora/oxdjango/api/views.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import division, absolute_import + import json from django.shortcuts import render diff --git a/pandora/oxdjango/decorators.py b/pandora/oxdjango/decorators.py index e631daef..bd6942e5 100644 --- a/pandora/oxdjango/decorators.py +++ b/pandora/oxdjango/decorators.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import + from functools import wraps from .shortcuts import render_to_json_response diff --git a/pandora/sequence/extract.py b/pandora/sequence/extract.py index 90db3b33..5cbcda50 100644 --- a/pandora/sequence/extract.py +++ b/pandora/sequence/extract.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import division import os from PIL import Image @@ -96,9 +97,7 @@ class DataTimeline(): def get_frame(self, pos): frame = int(pos * self.fps) tile = int(frame * 8 / self.timeline_width) - if len(self.file_names) <= tile: - tile = len(self.file_names) - 1 - if self.current_tile != tile and len(self.file_names): + if self.current_tile != tile: self.timeline_image = Image.open(self.file_names[tile]) self.current_tile = tile x = frame * 8 - tile * self.timeline_width diff --git a/pandora/settings.py b/pandora/settings.py index 99eda0ba..6cb4f347 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -2,6 +2,7 @@ # Django settings for pan.do/ra project defaults, # create local_settings.py to overwrite # check pan.do/ra section below for relevant settings +from __future__ import absolute_import import os from os.path import join, normpath, dirname diff --git a/pandora/websocket/management/commands/websocketd.py b/pandora/websocket/management/commands/websocketd.py index f93bc9d6..0eb9ed25 100644 --- a/pandora/websocket/management/commands/websocketd.py +++ b/pandora/websocket/management/commands/websocketd.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import + import os from django.core.management.base import BaseCommand diff --git a/pandora/websocket/worker.py b/pandora/websocket/worker.py index 1a0e633d..72c35e5a 100644 --- a/pandora/websocket/worker.py +++ b/pandora/websocket/worker.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import logging +from __future__ import absolute_import from django.conf import settings @@ -8,7 +8,6 @@ from kombu.mixins import ConsumerMixin from . import daemon, key -logger = logging.getLogger('pandora.websocket') queue = Queue('websocket', Exchange(key, type='direct'), routing_key=key) @@ -23,11 +22,8 @@ class Worker(ConsumerMixin): callbacks=[self.process_task])] def process_task(self, body, message): - try: - if body['task'] == 'trigger_event': - daemon.trigger_event(*body['args']) - except: - logger.error('faild to trigger event %s', body, exc_info=True) + if body['task'] == 'trigger_event': + daemon.trigger_event(*body['args']) message.ack() def run(): diff --git a/scripts/poster.0xdb.py b/scripts/poster.0xdb.py index 9b9f2470..bd05982d 100755 --- a/scripts/poster.0xdb.py +++ b/scripts/poster.0xdb.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +from __future__ import division import os from PIL import Image diff --git a/scripts/poster.indiancinema.py b/scripts/poster.indiancinema.py index bc37fca5..194700d5 100755 --- a/scripts/poster.indiancinema.py +++ b/scripts/poster.indiancinema.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +from __future__ import division import os from PIL import Image diff --git a/scripts/poster.padma.py b/scripts/poster.padma.py index 015aaa9b..81ec3dfe 100755 --- a/scripts/poster.padma.py +++ b/scripts/poster.padma.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +from __future__ import division import os from PIL import Image diff --git a/scripts/poster.pandora.py b/scripts/poster.pandora.py index 5f196562..6177efd8 100755 --- a/scripts/poster.pandora.py +++ b/scripts/poster.pandora.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +from __future__ import division import os from PIL import Image diff --git a/update.py b/update.py index 3a2c7a40..566d23f9 100755 --- a/update.py +++ b/update.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +from __future__ import print_function import json import os import shutil