From dd0e0dbab77c66843ee82f15adfe518acd84e9e2 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 18 Feb 2016 19:59:57 +0530 Subject: [PATCH] cleanup imports --- bin/oxtimelines | 4 ---- oxtimelines/__init__.py | 8 -------- oxtimelines/ffmpeg.py | 2 +- oxtimelines/timeline.py | 6 ++++-- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/bin/oxtimelines b/bin/oxtimelines index 2818575..5850848 100755 --- a/bin/oxtimelines +++ b/bin/oxtimelines @@ -5,16 +5,12 @@ import os import sys -from glob import glob from optparse import OptionParser -import Image - root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') if os.path.exists(os.path.join(root, 'oxtimelines')): sys.path.insert(0, root) -import ox import oxtimelines # fixme: -w option should be 'keyframeswide' mode diff --git a/oxtimelines/__init__.py b/oxtimelines/__init__.py index 3a2ea29..3bfdf13 100644 --- a/oxtimelines/__init__.py +++ b/oxtimelines/__init__.py @@ -4,12 +4,4 @@ __version__ = 'git' -from glob import glob -import math -import os -import time - -import Image - -import timeline from timeline import Timelines diff --git a/oxtimelines/ffmpeg.py b/oxtimelines/ffmpeg.py index 23e4cc4..40b0862 100644 --- a/oxtimelines/ffmpeg.py +++ b/oxtimelines/ffmpeg.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 # GPL 2014 - from __future__ import division, with_statement, print_function import fractions @@ -11,6 +10,7 @@ import Image import numpy as np import ox + FFMPEG = None for cmd in ('ffmpeg', 'avconv'): cmd = ox.file.cmd(cmd) diff --git a/oxtimelines/timeline.py b/oxtimelines/timeline.py index a56319e..6692496 100644 --- a/oxtimelines/timeline.py +++ b/oxtimelines/timeline.py @@ -1,17 +1,19 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 # GPL 2008-2014 - from __future__ import division, with_statement, print_function from glob import glob +from time import time import Image import math import os -from time import time + import ox + from .ffmpeg import Video + FPS = 25 class Timelines():