From 1c368a195dbbba68a398b93152bef1e638d141f2 Mon Sep 17 00:00:00 2001 From: Tom Burrows Date: Sat, 22 Feb 2020 16:49:48 +0000 Subject: [PATCH] Clean up imports with isort (#1084) Ran `isort --recursive moviepy tests examples` --- examples/dancing_knights.py | 8 ++++---- examples/example_with_sound.py | 1 - examples/headblur.py | 1 - examples/logo.py | 4 ++-- examples/moving_letters.py | 2 +- examples/soundtrack.py | 2 -- examples/star_worms.py | 5 ++--- moviepy/Clip.py | 15 ++++++--------- moviepy/audio/AudioClip.py | 7 ++++--- moviepy/audio/__init__.py | 1 - moviepy/audio/fx/all/__init__.py | 3 ++- moviepy/audio/fx/audio_fadein.py | 4 +++- moviepy/audio/fx/audio_fadeout.py | 4 +++- moviepy/audio/fx/audio_left_right.py | 2 +- moviepy/audio/fx/audio_loop.py | 2 +- moviepy/audio/fx/audio_normalize.py | 2 ++ moviepy/audio/fx/volumex.py | 1 - moviepy/audio/io/AudioFileClip.py | 1 - moviepy/audio/io/ffmpeg_audiowriter.py | 4 ++-- moviepy/audio/io/preview.py | 4 ++-- moviepy/audio/io/readers.py | 7 ++++--- moviepy/audio/tools/cuts.py | 4 +++- moviepy/compat.py | 1 + moviepy/config.py | 3 ++- moviepy/decorators.py | 2 +- moviepy/tools.py | 5 +++-- moviepy/utils.py | 3 ++- moviepy/video/VideoClip.py | 2 +- moviepy/video/__init__.py | 1 - moviepy/video/compositing/CompositeVideoClip.py | 5 ++--- moviepy/video/compositing/__init__.py | 1 - moviepy/video/compositing/concatenate.py | 11 ++++++----- moviepy/video/compositing/on_color.py | 3 ++- moviepy/video/compositing/transitions.py | 5 +++-- moviepy/video/fx/accel_decel.py | 2 +- moviepy/video/fx/all/__init__.py | 3 ++- moviepy/video/fx/blackwhite.py | 1 + moviepy/video/fx/blink.py | 1 + moviepy/video/fx/colorx.py | 1 + moviepy/video/fx/even_size.py | 3 +-- moviepy/video/fx/fadein.py | 5 +++-- moviepy/video/fx/fadeout.py | 8 +++----- moviepy/video/fx/freeze.py | 5 +++-- moviepy/video/fx/freeze_region.py | 3 ++- moviepy/video/fx/headblur.py | 1 - moviepy/video/fx/loop.py | 4 +--- moviepy/video/fx/make_loopable.py | 1 + moviepy/video/fx/margin.py | 3 +-- moviepy/video/fx/mask_and.py | 4 +++- moviepy/video/fx/mask_color.py | 3 ++- moviepy/video/fx/mask_or.py | 4 +++- moviepy/video/fx/painting.py | 2 +- moviepy/video/fx/resize.py | 2 +- moviepy/video/fx/rotate.py | 6 ++++-- moviepy/video/fx/speedx.py | 2 +- moviepy/video/fx/supersample.py | 5 +++-- moviepy/video/fx/time_mirror.py | 3 +-- moviepy/video/fx/time_symmetrize.py | 5 +++-- moviepy/video/io/ImageSequenceClip.py | 3 ++- moviepy/video/io/VideoFileClip.py | 2 +- moviepy/video/io/bindings.py | 3 +-- moviepy/video/io/ffmpeg_reader.py | 15 +++++++++------ moviepy/video/io/ffmpeg_tools.py | 7 +++---- moviepy/video/io/ffmpeg_writer.py | 6 ++++-- moviepy/video/io/gif_writers.py | 9 +++++---- moviepy/video/io/html_tools.py | 7 ++++--- moviepy/video/io/preview.py | 6 +++--- moviepy/video/io/sliders.py | 3 ++- moviepy/video/tools/credits.py | 2 +- moviepy/video/tools/cuts.py | 5 ++++- moviepy/video/tools/drawing.py | 1 + moviepy/video/tools/interpolators.py | 1 + moviepy/video/tools/segmenting.py | 1 + moviepy/video/tools/subtitles.py | 6 ++++-- moviepy/video/tools/tracking.py | 4 ++-- tests/test_AudioClips.py | 6 ++++-- tests/test_ImageSequenceClip.py | 2 ++ tests/test_PR.py | 8 +++++--- tests/test_TextClip.py | 2 ++ tests/test_VideoClip.py | 11 ++++++----- tests/test_VideoFileClip.py | 6 ++++-- tests/test_Videos.py | 2 ++ tests/test_compositing.py | 5 ++++- tests/test_ffmpeg_reader.py | 2 ++ tests/test_fx.py | 6 ++++-- tests/test_helper.py | 1 - tests/test_issues.py | 5 +++-- tests/test_misc.py | 8 +++++--- tests/test_resourcerelease.py | 11 ++++++----- tests/test_resourcereleasedemo.py | 12 +++++++----- tests/test_tools.py | 3 ++- tests/test_videotools.py | 3 ++- 92 files changed, 216 insertions(+), 161 deletions(-) diff --git a/examples/dancing_knights.py b/examples/dancing_knights.py index 3a081a75d..913057b47 100644 --- a/examples/dancing_knights.py +++ b/examples/dancing_knights.py @@ -21,10 +21,11 @@ easy to preview and fine-tune each part of the editing. """ +import os + +from moviepy.audio.tools.cuts import find_audio_period from moviepy.editor import * from moviepy.video.tools.cuts import find_video_period -from moviepy.audio.tools.cuts import find_audio_period - # Next lines are for downloading the required videos from Youtube. # To do this you must have youtube-dl installed, otherwise you will need to @@ -32,7 +33,6 @@ # https://www.youtube.com/watch?v=zvCvOC2VwDc => knights.mp4 # https://www.youtube.com/watch?v=lkY3Ek9VPtg => frontier.mp4 -import os if not os.path.exists("knights.mp4"): os.system("youtube-dl zvCvOC2VwDc -o knights.mp4") os.system("youtube-dl lkY3Ek9VPtg -o frontier.mp4") @@ -116,4 +116,4 @@ final = concatenate_videoclips([title, dancing_knights, credits]) final.write_videofile("dancing_knights.mp4", fps=clip.fps, - audio_bitrate="1000k", bitrate="4000k") \ No newline at end of file + audio_bitrate="1000k", bitrate="4000k") diff --git a/examples/example_with_sound.py b/examples/example_with_sound.py index 38cd4cf4c..85b4f8f10 100644 --- a/examples/example_with_sound.py +++ b/examples/example_with_sound.py @@ -8,7 +8,6 @@ from moviepy.editor import * from moviepy.video.tools.drawing import color_split - duration = 6 # duration of the final clip # LOAD THE MAIN SCENE diff --git a/examples/headblur.py b/examples/headblur.py index 5d55f04bc..b7f993204 100644 --- a/examples/headblur.py +++ b/examples/headblur.py @@ -3,7 +3,6 @@ from moviepy.editor import * from moviepy.video.tools.tracking import manual_tracking, to_fxfy - # LOAD THE CLIP (subclip 6'51 - 7'01 of a chaplin movie) clip = VideoFileClip("../../videos/chaplin.mp4").subclip((6,51.7),(7,01.3)) diff --git a/examples/logo.py b/examples/logo.py index d76a0bf72..439939001 100644 --- a/examples/logo.py +++ b/examples/logo.py @@ -1,7 +1,7 @@ -from moviepy.editor import * - import numpy as np +from moviepy.editor import * + w,h = moviesize = (720,380) duration = 1 diff --git a/examples/moving_letters.py b/examples/moving_letters.py index 61034e444..6b1dae27d 100644 --- a/examples/moving_letters.py +++ b/examples/moving_letters.py @@ -1,4 +1,5 @@ import numpy as np + from moviepy.editor import * from moviepy.video.tools.segmenting import findObjects @@ -62,4 +63,3 @@ def moveLetters(letters, funcpos): final_clip = concatenate_videoclips(clips) final_clip.write_videofile('../../coolTextEffects.avi',fps=25,codec='mpeg4') - diff --git a/examples/soundtrack.py b/examples/soundtrack.py index 1def1c2e9..38c20b209 100644 --- a/examples/soundtrack.py +++ b/examples/soundtrack.py @@ -1,7 +1,6 @@ """ A simple test script on how to put a soundtrack to a movie """ from moviepy.editor import * - # We load a movie and replace the sound with some music: movie = VideoFileClip("../../videos/dam.mov").\ @@ -15,4 +14,3 @@ #~ movie.audio = movie.audio.set_duration(movie.duration) movie.write_videofile("../../test_soundtrack.avi", codec="mpeg4") - diff --git a/examples/star_worms.py b/examples/star_worms.py index 5e2ebb2b4..97ccf0d84 100644 --- a/examples/star_worms.py +++ b/examples/star_worms.py @@ -7,11 +7,10 @@ """ import numpy as np -from skimage import transform as tf from moviepy.editor import * from moviepy.video.tools.drawing import color_gradient - +from skimage import transform as tf # RESOLUTION @@ -176,4 +175,4 @@ def composeCenter(clip): # Concatenate and write to a file -concatenate_videoclips(annotated_clips).write_videofile('tutorial.avi', fps=5) \ No newline at end of file +concatenate_videoclips(annotated_clips).write_videofile('tutorial.avi', fps=5) diff --git a/moviepy/Clip.py b/moviepy/Clip.py index 007e6c3a6..315024b4d 100644 --- a/moviepy/Clip.py +++ b/moviepy/Clip.py @@ -5,16 +5,14 @@ """ from copy import copy -import numpy as np -from moviepy.decorators import (apply_to_mask, - apply_to_audio, - requires_duration, - outplace, - convert_to_seconds, - use_clip_fps_by_default) -from tqdm import tqdm +import numpy as np import proglog +from tqdm import tqdm + +from moviepy.decorators import (apply_to_audio, apply_to_mask, + convert_to_seconds, outplace, + requires_duration, use_clip_fps_by_default) class Clip: @@ -502,4 +500,3 @@ def __enter__(self): def __exit__(self, exc_type, exc_value, traceback): self.close() - diff --git a/moviepy/audio/AudioClip.py b/moviepy/audio/AudioClip.py index 85724071b..8fd7b9f6f 100644 --- a/moviepy/audio/AudioClip.py +++ b/moviepy/audio/AudioClip.py @@ -1,13 +1,14 @@ import os + import numpy as np import proglog +from tqdm import tqdm + from moviepy.audio.io.ffmpeg_audiowriter import ffmpeg_audiowrite +from moviepy.Clip import Clip from moviepy.decorators import requires_duration from moviepy.tools import deprecated_version_of, extensions_dict -from moviepy.Clip import Clip -from tqdm import tqdm - class AudioClip(Clip): """ Base class for audio clips. diff --git a/moviepy/audio/__init__.py b/moviepy/audio/__init__.py index 8b1378917..e69de29bb 100644 --- a/moviepy/audio/__init__.py +++ b/moviepy/audio/__init__.py @@ -1 +0,0 @@ - diff --git a/moviepy/audio/fx/all/__init__.py b/moviepy/audio/fx/all/__init__.py index c56917636..11258d7f0 100644 --- a/moviepy/audio/fx/all/__init__.py +++ b/moviepy/audio/fx/all/__init__.py @@ -6,10 +6,11 @@ """ import pkgutil + import moviepy.audio.fx as fx __all__ = [name for _, name, _ in pkgutil.iter_modules( fx.__path__) if name != "all"] for name in __all__: - exec("from ..%s import %s" % (name, name)) \ No newline at end of file + exec("from ..%s import %s" % (name, name)) diff --git a/moviepy/audio/fx/audio_fadein.py b/moviepy/audio/fx/audio_fadein.py index 39032c351..20b1eed00 100644 --- a/moviepy/audio/fx/audio_fadein.py +++ b/moviepy/audio/fx/audio_fadein.py @@ -1,6 +1,8 @@ -from moviepy.decorators import audio_video_fx import numpy as np +from moviepy.decorators import audio_video_fx + + @audio_video_fx def audio_fadein(clip, duration): """ Return an audio (or video) clip that is first mute, then the diff --git a/moviepy/audio/fx/audio_fadeout.py b/moviepy/audio/fx/audio_fadeout.py index 4e80c954c..ab6f40ee5 100644 --- a/moviepy/audio/fx/audio_fadeout.py +++ b/moviepy/audio/fx/audio_fadeout.py @@ -1,6 +1,8 @@ -from moviepy.decorators import audio_video_fx, requires_duration import numpy as np +from moviepy.decorators import audio_video_fx, requires_duration + + @audio_video_fx @requires_duration def audio_fadeout(clip, duration): diff --git a/moviepy/audio/fx/audio_left_right.py b/moviepy/audio/fx/audio_left_right.py index dfa592f5d..c98abcc0c 100644 --- a/moviepy/audio/fx/audio_left_right.py +++ b/moviepy/audio/fx/audio_left_right.py @@ -1,5 +1,6 @@ import numpy as np + def audio_left_right(audioclip, left=1, right=1, merge=False): """ NOT YET FINISHED @@ -12,4 +13,3 @@ def audio_left_right(audioclip, left=1, right=1, merge=False): """ funleft = (lambda t: left) if np.isscalar(left) else left funright = (lambda t: right) if np.isscalar(right) else right - diff --git a/moviepy/audio/fx/audio_loop.py b/moviepy/audio/fx/audio_loop.py index 43c967f8e..7e309b7ff 100644 --- a/moviepy/audio/fx/audio_loop.py +++ b/moviepy/audio/fx/audio_loop.py @@ -1,5 +1,6 @@ from ..AudioClip import concatenate_audioclips + def audio_loop(audioclip, nloops=None, duration=None): """ Loops over an audio clip. @@ -25,4 +26,3 @@ def audio_loop(audioclip, nloops=None, duration=None): else: return concatenate_audioclips(nloops*[audioclip]) - diff --git a/moviepy/audio/fx/audio_normalize.py b/moviepy/audio/fx/audio_normalize.py index 129daa6a9..34c5ff29d 100644 --- a/moviepy/audio/fx/audio_normalize.py +++ b/moviepy/audio/fx/audio_normalize.py @@ -1,6 +1,8 @@ from moviepy.decorators import audio_video_fx + from .volumex import volumex + @audio_video_fx def audio_normalize(clip): """ Return an audio (or video) clip whose volume is normalized diff --git a/moviepy/audio/fx/volumex.py b/moviepy/audio/fx/volumex.py index 400da4046..6ec84ad5c 100644 --- a/moviepy/audio/fx/volumex.py +++ b/moviepy/audio/fx/volumex.py @@ -18,4 +18,3 @@ def volumex(clip, factor): """ return clip.fl(lambda gf, t: factor * gf(t), keep_duration=True) - diff --git a/moviepy/audio/io/AudioFileClip.py b/moviepy/audio/io/AudioFileClip.py index 8ab3ad81b..e93dbb04c 100644 --- a/moviepy/audio/io/AudioFileClip.py +++ b/moviepy/audio/io/AudioFileClip.py @@ -1,6 +1,5 @@ from __future__ import division - from moviepy.audio.AudioClip import AudioClip from moviepy.audio.io.readers import FFMPEG_AudioReader diff --git a/moviepy/audio/io/ffmpeg_audiowriter.py b/moviepy/audio/io/ffmpeg_audiowriter.py index 7e1538f1c..d02649f52 100644 --- a/moviepy/audio/io/ffmpeg_audiowriter.py +++ b/moviepy/audio/io/ffmpeg_audiowriter.py @@ -1,9 +1,9 @@ -import subprocess as sp import os +import subprocess as sp + import proglog from moviepy.compat import DEVNULL - from moviepy.config import get_setting from moviepy.decorators import requires_duration diff --git a/moviepy/audio/io/preview.py b/moviepy/audio/io/preview.py index 26c3e3ae8..e321b2978 100644 --- a/moviepy/audio/io/preview.py +++ b/moviepy/audio/io/preview.py @@ -1,9 +1,9 @@ import time -import numpy as np -from moviepy.decorators import requires_duration +import numpy as np import pygame as pg +from moviepy.decorators import requires_duration pg.init() pg.display.set_caption('MoviePy') diff --git a/moviepy/audio/io/readers.py b/moviepy/audio/io/readers.py index 6225356c1..cfecc826b 100644 --- a/moviepy/audio/io/readers.py +++ b/moviepy/audio/io/readers.py @@ -1,11 +1,12 @@ +import os import subprocess as sp import warnings import numpy as np -from moviepy.video.io.ffmpeg_reader import ffmpeg_parse_infos + +from moviepy.compat import DEVNULL, PY3 from moviepy.config import get_setting -from moviepy.compat import PY3, DEVNULL -import os +from moviepy.video.io.ffmpeg_reader import ffmpeg_parse_infos class FFMPEG_AudioReader: diff --git a/moviepy/audio/tools/cuts.py b/moviepy/audio/tools/cuts.py index eddd07779..3adedbb48 100644 --- a/moviepy/audio/tools/cuts.py +++ b/moviepy/audio/tools/cuts.py @@ -1,5 +1,7 @@ import numpy as np + + def find_audio_period(aclip, t_min=.1, t_max=2, t_res=.01): """ Finds the period, in seconds of an audioclip. @@ -17,4 +19,4 @@ def find_audio_period(aclip, t_min=.1, t_max=2, t_res=.01): corrs = np.correlate(v, v, mode = 'full')[-len(v):] corrs[:int(t_min/chunk_duration)]=0 corrs[int(t_max/chunk_duration):]=0 - return chunk_duration*np.argmax(corrs) \ No newline at end of file + return chunk_duration*np.argmax(corrs) diff --git a/moviepy/compat.py b/moviepy/compat.py index 0404e57f6..e97b11bb7 100644 --- a/moviepy/compat.py +++ b/moviepy/compat.py @@ -1,5 +1,6 @@ import os import sys + PY3=sys.version_info.major >= 3 try: diff --git a/moviepy/config.py b/moviepy/config.py index 0f1741031..b1ce2f856 100644 --- a/moviepy/config.py +++ b/moviepy/config.py @@ -1,6 +1,8 @@ import os import subprocess as sp + from .compat import DEVNULL +from .config_defaults import FFMPEG_BINARY, IMAGEMAGICK_BINARY if os.name == 'nt': try: @@ -8,7 +10,6 @@ except ImportError: import _winreg as wr # py2k -from .config_defaults import (FFMPEG_BINARY, IMAGEMAGICK_BINARY) def try_cmd(cmd): try: diff --git a/moviepy/decorators.py b/moviepy/decorators.py index e73756a21..44f346eb1 100644 --- a/moviepy/decorators.py +++ b/moviepy/decorators.py @@ -3,8 +3,8 @@ """ import decorator -from moviepy.tools import cvsecs +from moviepy.tools import cvsecs @decorator.decorator diff --git a/moviepy/tools.py b/moviepy/tools.py index a9c469350..e5e6b9cfb 100644 --- a/moviepy/tools.py +++ b/moviepy/tools.py @@ -2,13 +2,14 @@ Misc. useful functions that can be used at many places in the program. """ +import os +import re import subprocess as sp import sys import warnings -import re + import proglog -import os from .compat import DEVNULL diff --git a/moviepy/utils.py b/moviepy/utils.py index 320ce270c..5979ccbc2 100644 --- a/moviepy/utils.py +++ b/moviepy/utils.py @@ -1,7 +1,8 @@ -from moviepy.video.io.VideoFileClip import VideoFileClip from moviepy.audio.io.AudioFileClip import AudioFileClip +from moviepy.video.io.VideoFileClip import VideoFileClip from moviepy.video.VideoClip import ImageClip + def close_all_clips(objects='globals', types=('audio', 'video', 'image')): if objects == 'globals': objects = globals() diff --git a/moviepy/video/VideoClip.py b/moviepy/video/VideoClip.py index c50247123..6f535bf25 100644 --- a/moviepy/video/VideoClip.py +++ b/moviepy/video/VideoClip.py @@ -10,8 +10,8 @@ import warnings import numpy as np -from imageio import imread, imsave import proglog +from imageio import imread, imsave from ..Clip import Clip from ..compat import DEVNULL, string_types diff --git a/moviepy/video/__init__.py b/moviepy/video/__init__.py index 8b1378917..e69de29bb 100644 --- a/moviepy/video/__init__.py +++ b/moviepy/video/__init__.py @@ -1 +0,0 @@ - diff --git a/moviepy/video/compositing/CompositeVideoClip.py b/moviepy/video/compositing/CompositeVideoClip.py index 65e1735fa..284648c88 100644 --- a/moviepy/video/compositing/CompositeVideoClip.py +++ b/moviepy/video/compositing/CompositeVideoClip.py @@ -1,6 +1,7 @@ import numpy as np -from moviepy.video.VideoClip import VideoClip, ColorClip + from moviepy.audio.AudioClip import CompositeAudioClip +from moviepy.video.VideoClip import ColorClip, VideoClip # CompositeVideoClip @@ -184,5 +185,3 @@ def clips_array(array, rows_widths=None, cols_widths=None, return CompositeVideoClip(array.flatten(), size = (xx[-1],yy[-1]), bg_color = bg_color) - - diff --git a/moviepy/video/compositing/__init__.py b/moviepy/video/compositing/__init__.py index 8b1378917..e69de29bb 100644 --- a/moviepy/video/compositing/__init__.py +++ b/moviepy/video/compositing/__init__.py @@ -1 +0,0 @@ - diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py index 3097dcb4d..f7882089e 100644 --- a/moviepy/video/compositing/concatenate.py +++ b/moviepy/video/compositing/concatenate.py @@ -1,16 +1,17 @@ import numpy as np +from moviepy.audio.AudioClip import CompositeAudioClip +from moviepy.tools import deprecated_version_of +from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip +from moviepy.video.compositing.on_color import on_color +from moviepy.video.VideoClip import ColorClip, VideoClip + try: # Python 2 reduce except NameError: # Python 3 from functools import reduce -from moviepy.tools import deprecated_version_of -from moviepy.video.VideoClip import VideoClip, ColorClip -from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip -from moviepy.audio.AudioClip import CompositeAudioClip -from moviepy.video.compositing.on_color import on_color def concatenate_videoclips(clips, method="chain", transition=None, bg_color=None, ismask=False, padding = 0): diff --git a/moviepy/video/compositing/on_color.py b/moviepy/video/compositing/on_color.py index ed664535c..c5fcb147b 100644 --- a/moviepy/video/compositing/on_color.py +++ b/moviepy/video/compositing/on_color.py @@ -1,5 +1,6 @@ -from moviepy.video.VideoClip import ColorClip from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip +from moviepy.video.VideoClip import ColorClip + def on_color(clip, size=None, color=(0, 0, 0), pos=None, col_opacity=None): """ diff --git a/moviepy/video/compositing/transitions.py b/moviepy/video/compositing/transitions.py index cf0a7ffaf..ab2920b23 100644 --- a/moviepy/video/compositing/transitions.py +++ b/moviepy/video/compositing/transitions.py @@ -4,11 +4,12 @@ if you load them with ``from moviepy.editor import *`` """ -from moviepy.decorators import requires_duration, add_mask_if_none -from .CompositeVideoClip import CompositeVideoClip +from moviepy.decorators import add_mask_if_none, requires_duration from moviepy.video.fx.fadein import fadein from moviepy.video.fx.fadeout import fadeout +from .CompositeVideoClip import CompositeVideoClip + @requires_duration @add_mask_if_none diff --git a/moviepy/video/fx/accel_decel.py b/moviepy/video/fx/accel_decel.py index a7c413caf..6fbb4cca5 100644 --- a/moviepy/video/fx/accel_decel.py +++ b/moviepy/video/fx/accel_decel.py @@ -41,4 +41,4 @@ def accel_decel(clip, new_duration=None, abruptness=1.0, soonness=1.0): fl = lambda t : f_accel_decel(t, clip.duration, new_duration, abruptness, soonness) - return clip.fl_time(fl).set_duration(new_duration) \ No newline at end of file + return clip.fl_time(fl).set_duration(new_duration) diff --git a/moviepy/video/fx/all/__init__.py b/moviepy/video/fx/all/__init__.py index a74fb9c8a..a9a4c4e4e 100644 --- a/moviepy/video/fx/all/__init__.py +++ b/moviepy/video/fx/all/__init__.py @@ -7,10 +7,11 @@ """ import pkgutil + import moviepy.video.fx as fx __all__ = [name for _, name, _ in pkgutil.iter_modules( fx.__path__) if name != "all"] for name in __all__: - exec("from ..%s import %s" % (name, name)) \ No newline at end of file + exec("from ..%s import %s" % (name, name)) diff --git a/moviepy/video/fx/blackwhite.py b/moviepy/video/fx/blackwhite.py index 140c649c6..b6b95a887 100644 --- a/moviepy/video/fx/blackwhite.py +++ b/moviepy/video/fx/blackwhite.py @@ -1,5 +1,6 @@ import numpy as np + def blackwhite(clip, RGB = None, preserve_luminosity=True): """ Desaturates the picture, makes it black and white. Parameter RGB allows to set weights for the different color diff --git a/moviepy/video/fx/blink.py b/moviepy/video/fx/blink.py index 93e022b17..c8a962404 100644 --- a/moviepy/video/fx/blink.py +++ b/moviepy/video/fx/blink.py @@ -1,5 +1,6 @@ import copy + def blink(clip, d_on, d_off): """ Makes the clip blink. At each blink it will be displayed ``d_on`` diff --git a/moviepy/video/fx/colorx.py b/moviepy/video/fx/colorx.py index 4d6adb4fd..70f16d699 100644 --- a/moviepy/video/fx/colorx.py +++ b/moviepy/video/fx/colorx.py @@ -1,5 +1,6 @@ import numpy as np + def colorx(clip, factor): """ multiplies the clip's colors by the given factor, can be used to decrease or increase the clip's brightness (is that the diff --git a/moviepy/video/fx/even_size.py b/moviepy/video/fx/even_size.py index adeb636e7..04189a4c5 100644 --- a/moviepy/video/fx/even_size.py +++ b/moviepy/video/fx/even_size.py @@ -2,6 +2,7 @@ from moviepy.decorators import apply_to_mask + @apply_to_mask def even_size(clip): """ Crops the clip to make dimensions even. @@ -21,5 +22,3 @@ def even_size(clip): fl_image = lambda a : a[:-1,:,:] return clip.fl_image(fl_image) - - diff --git a/moviepy/video/fx/fadein.py b/moviepy/video/fx/fadein.py index bfd270a85..c9fda9254 100644 --- a/moviepy/video/fx/fadein.py +++ b/moviepy/video/fx/fadein.py @@ -1,4 +1,5 @@ -import numpy as np +import numpy as np + def fadein(clip, duration, initial_color=None): """ @@ -21,4 +22,4 @@ def fl(gf, t): fading = (1.0*t/duration) return fading*gf(t) + (1-fading)*initial_color - return clip.fl(fl) \ No newline at end of file + return clip.fl(fl) diff --git a/moviepy/video/fx/fadeout.py b/moviepy/video/fx/fadeout.py index 68f31dda1..66c7230a8 100644 --- a/moviepy/video/fx/fadeout.py +++ b/moviepy/video/fx/fadeout.py @@ -1,6 +1,8 @@ -from moviepy.decorators import requires_duration import numpy as np +from moviepy.decorators import requires_duration + + @requires_duration def fadeout(clip, duration, final_color=None): """ @@ -24,7 +26,3 @@ def fl(gf, t): return fading*gf(t) + (1-fading)*final_color return clip.fl(fl) - - - - diff --git a/moviepy/video/fx/freeze.py b/moviepy/video/fx/freeze.py index 2a0dfea74..fab0549ba 100644 --- a/moviepy/video/fx/freeze.py +++ b/moviepy/video/fx/freeze.py @@ -1,6 +1,7 @@ from moviepy.decorators import requires_duration -from moviepy.video.VideoClip import ImageClip from moviepy.video.compositing.concatenate import concatenate_videoclips +from moviepy.video.VideoClip import ImageClip + @requires_duration def freeze(clip, t=0, freeze_duration=None, total_duration=None, @@ -24,4 +25,4 @@ def freeze(clip, t=0, freeze_duration=None, total_duration=None, before = [clip.subclip(0,t)] if (t!=0) else [] freeze = [clip.to_ImageClip(t).set_duration(freeze_duration)] after = [clip.subclip(t)] if (t !=clip.duration) else [] - return concatenate_videoclips(before+freeze+after) \ No newline at end of file + return concatenate_videoclips(before+freeze+after) diff --git a/moviepy/video/fx/freeze_region.py b/moviepy/video/fx/freeze_region.py index 8578fa3fd..a8ec7cf09 100644 --- a/moviepy/video/fx/freeze_region.py +++ b/moviepy/video/fx/freeze_region.py @@ -1,7 +1,8 @@ from moviepy.decorators import apply_to_mask -from .crop import crop from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip +from .crop import crop + #@apply_to_mask def freeze_region(clip, t=0, region=None, outside_region=None, mask=None): diff --git a/moviepy/video/fx/headblur.py b/moviepy/video/fx/headblur.py index b1adf62b1..2d46d5a77 100644 --- a/moviepy/video/fx/headblur.py +++ b/moviepy/video/fx/headblur.py @@ -1,6 +1,5 @@ import numpy as np - #------- CHECKING DEPENDENCIES ----------------------------------------- try: import cv2 diff --git a/moviepy/video/fx/loop.py b/moviepy/video/fx/loop.py index ab9f7748e..b0c04beb3 100644 --- a/moviepy/video/fx/loop.py +++ b/moviepy/video/fx/loop.py @@ -1,6 +1,4 @@ -from moviepy.decorators import (apply_to_mask, - apply_to_audio, - requires_duration) +from moviepy.decorators import apply_to_audio, apply_to_mask, requires_duration @requires_duration diff --git a/moviepy/video/fx/make_loopable.py b/moviepy/video/fx/make_loopable.py index 131f39a8f..485887c7f 100644 --- a/moviepy/video/fx/make_loopable.py +++ b/moviepy/video/fx/make_loopable.py @@ -1,6 +1,7 @@ import moviepy.video.compositing.transitions as transfx from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip + def make_loopable(clip, cross): """ Makes the clip fade in progressively at its own end, this way diff --git a/moviepy/video/fx/margin.py b/moviepy/video/fx/margin.py index 786299dd8..20dd1930e 100644 --- a/moviepy/video/fx/margin.py +++ b/moviepy/video/fx/margin.py @@ -1,4 +1,5 @@ import numpy as np + from moviepy.decorators import apply_to_mask from moviepy.video.VideoClip import ImageClip @@ -55,5 +56,3 @@ def fl(gf, t): im[top:top + h, left:left + w] = pic return im return clip.fl(fl) - - diff --git a/moviepy/video/fx/mask_and.py b/moviepy/video/fx/mask_and.py index 9b5c21dd3..ccec602ab 100644 --- a/moviepy/video/fx/mask_and.py +++ b/moviepy/video/fx/mask_and.py @@ -1,6 +1,8 @@ import numpy as np + from ..VideoClip import ImageClip + def mask_and(clip, other_clip): """ Returns the logical 'and' (min) between two masks. other_clip can be a mask clip or a picture (np.array). @@ -15,4 +17,4 @@ def mask_and(clip, other_clip): return clip.fl_image(lambda f : np.minimum(f, other_clip)) else: return clip.fl(lambda gf, t : np.minimum(gf(t), - other_clip.get_frame(t))) \ No newline at end of file + other_clip.get_frame(t))) diff --git a/moviepy/video/fx/mask_color.py b/moviepy/video/fx/mask_color.py index b5c102d88..fa3851892 100644 --- a/moviepy/video/fx/mask_color.py +++ b/moviepy/video/fx/mask_color.py @@ -1,5 +1,6 @@ import numpy as np + def mask_color(clip, color=None, thr=0, s=1): """ Returns a new clip with a mask for transparency where the original clip is of the given color. @@ -22,4 +23,4 @@ def mask_color(clip, color=None, thr=0, s=1): mask = clip.fl_image(flim) mask.ismask= True newclip = clip.set_mask(mask) - return newclip \ No newline at end of file + return newclip diff --git a/moviepy/video/fx/mask_or.py b/moviepy/video/fx/mask_or.py index 66af20881..abe5e74f4 100644 --- a/moviepy/video/fx/mask_or.py +++ b/moviepy/video/fx/mask_or.py @@ -1,6 +1,8 @@ import numpy as np + from ..VideoClip import ImageClip + def mask_or(clip, other_clip): """ Returns the logical 'or' (max) between two masks. other_clip can be a mask clip or a picture (np.array). @@ -15,4 +17,4 @@ def mask_or(clip, other_clip): return clip.fl_image(lambda f : np.maximum(f, other_clip)) else: return clip.fl(lambda gf, t : np.maximum(gf(t), - other_clip.get_frame(t))) \ No newline at end of file + other_clip.get_frame(t))) diff --git a/moviepy/video/fx/painting.py b/moviepy/video/fx/painting.py index 85228e6e4..b41bac30d 100644 --- a/moviepy/video/fx/painting.py +++ b/moviepy/video/fx/painting.py @@ -13,6 +13,7 @@ import numpy as np + def to_painting(image,saturation = 1.4,black = 0.006): """ transforms any photo into some kind of painting """ edges = sobel(image.mean(axis=2)) @@ -40,4 +41,3 @@ def painting(clip, newsize=None, height=None, width=None): painting.__doc__ = doc #----------------------------------------------------------------------- - diff --git a/moviepy/video/fx/resize.py b/moviepy/video/fx/resize.py index deed05b8e..8636e749a 100644 --- a/moviepy/video/fx/resize.py +++ b/moviepy/video/fx/resize.py @@ -56,7 +56,7 @@ def resizer(pic, newsize): from moviepy.decorators import apply_to_mask - + def resize(clip, newsize=None, height=None, width=None, apply_to_mask=True): """ diff --git a/moviepy/video/fx/rotate.py b/moviepy/video/fx/rotate.py index 5755ff540..da22268d0 100644 --- a/moviepy/video/fx/rotate.py +++ b/moviepy/video/fx/rotate.py @@ -1,5 +1,7 @@ -from moviepy.decorators import apply_to_mask import numpy as np + +from moviepy.decorators import apply_to_mask + try: from PIL import Image PIL_FOUND = True @@ -68,4 +70,4 @@ def fl(gf, t): else: return pil_rotater(im, a, resample=resample, expand=expand) - return clip.fl(fl, apply_to=["mask"]) \ No newline at end of file + return clip.fl(fl, apply_to=["mask"]) diff --git a/moviepy/video/fx/speedx.py b/moviepy/video/fx/speedx.py index e98b7522e..1c6b82cff 100644 --- a/moviepy/video/fx/speedx.py +++ b/moviepy/video/fx/speedx.py @@ -1,4 +1,4 @@ -from moviepy.decorators import apply_to_mask,apply_to_audio +from moviepy.decorators import apply_to_audio, apply_to_mask def speedx(clip, factor = None, final_duration=None): diff --git a/moviepy/video/fx/supersample.py b/moviepy/video/fx/supersample.py index 5c7162b50..93b9d7a43 100644 --- a/moviepy/video/fx/supersample.py +++ b/moviepy/video/fx/supersample.py @@ -1,5 +1,6 @@ import numpy as np - + + def supersample(clip, d, nframes): """ Replaces each frame at time t by the mean of `nframes` equally spaced frames taken in the interval [t-d, t+d]. This results in motion blur.""" @@ -9,4 +10,4 @@ def fl(gf, t): avg = np.mean(1.0*np.array([gf(t_) for t_ in tt], dtype='uint16'), axis=0) return avg.astype("uint8") - return clip.fl(fl) \ No newline at end of file + return clip.fl(fl) diff --git a/moviepy/video/fx/time_mirror.py b/moviepy/video/fx/time_mirror.py index 0e3da2305..1c044e3e3 100644 --- a/moviepy/video/fx/time_mirror.py +++ b/moviepy/video/fx/time_mirror.py @@ -1,5 +1,4 @@ -from moviepy.decorators import (apply_to_mask, apply_to_audio, - requires_duration) +from moviepy.decorators import apply_to_audio, apply_to_mask, requires_duration @requires_duration diff --git a/moviepy/video/fx/time_symmetrize.py b/moviepy/video/fx/time_symmetrize.py index 9eca6f2b8..de2f3181d 100644 --- a/moviepy/video/fx/time_symmetrize.py +++ b/moviepy/video/fx/time_symmetrize.py @@ -1,8 +1,9 @@ -from moviepy.decorators import (apply_to_mask, apply_to_audio, - requires_duration) +from moviepy.decorators import apply_to_audio, apply_to_mask, requires_duration from moviepy.video.compositing.concatenate import concatenate_videoclips + from .time_mirror import time_mirror + @requires_duration @apply_to_mask def time_symmetrize(clip): diff --git a/moviepy/video/io/ImageSequenceClip.py b/moviepy/video/io/ImageSequenceClip.py index 31b09558d..662138c00 100644 --- a/moviepy/video/io/ImageSequenceClip.py +++ b/moviepy/video/io/ImageSequenceClip.py @@ -1,8 +1,9 @@ import os + import numpy as np +from imageio import imread from ..VideoClip import VideoClip -from imageio import imread class ImageSequenceClip(VideoClip): diff --git a/moviepy/video/io/VideoFileClip.py b/moviepy/video/io/VideoFileClip.py index cd5534e1d..1d5c8b63e 100644 --- a/moviepy/video/io/VideoFileClip.py +++ b/moviepy/video/io/VideoFileClip.py @@ -1,9 +1,9 @@ import os -from moviepy.video.VideoClip import VideoClip from moviepy.audio.io.AudioFileClip import AudioFileClip from moviepy.Clip import Clip from moviepy.video.io.ffmpeg_reader import FFMPEG_VideoReader +from moviepy.video.VideoClip import VideoClip class VideoFileClip(VideoClip): diff --git a/moviepy/video/io/bindings.py b/moviepy/video/io/bindings.py index 6451c117f..2545ff2b6 100644 --- a/moviepy/video/io/bindings.py +++ b/moviepy/video/io/bindings.py @@ -5,6 +5,7 @@ import numpy as np + def PIL_to_npimage(im): """ Transforms a PIL/Pillow image into a numpy RGB(A) image. Actually all this do is returning numpy.array(im).""" @@ -29,5 +30,3 @@ def mplfig_to_npimage(fig): buf = canvas.tostring_rgb() image= np.fromstring(buf,dtype=np.uint8) return image.reshape(h,w,3) - - diff --git a/moviepy/video/io/ffmpeg_reader.py b/moviepy/video/io/ffmpeg_reader.py index 268d51b1e..b8ba8be6c 100644 --- a/moviepy/video/io/ffmpeg_reader.py +++ b/moviepy/video/io/ffmpeg_reader.py @@ -5,19 +5,22 @@ from __future__ import division -import subprocess as sp +import logging +import os import re +import subprocess as sp import warnings -import logging -logging.captureWarnings(True) - import numpy as np + +from moviepy.compat import DEVNULL, PY3 from moviepy.config import get_setting # ffmpeg, ffmpeg.exe, etc... from moviepy.tools import cvsecs -from moviepy.compat import PY3, DEVNULL -import os +logging.captureWarnings(True) + + + class FFMPEG_VideoReader: diff --git a/moviepy/video/io/ffmpeg_tools.py b/moviepy/video/io/ffmpeg_tools.py index 523172f16..29d03c96c 100644 --- a/moviepy/video/io/ffmpeg_tools.py +++ b/moviepy/video/io/ffmpeg_tools.py @@ -1,12 +1,12 @@ """ Misc. bindings to ffmpeg and ImageMagick.""" import os -import sys import subprocess as sp +import sys -from moviepy.tools import subprocess_call from moviepy.config import get_setting - +from moviepy.tools import subprocess_call + def ffmpeg_movie_from_frames(filename, folder, fps, digits=6, bitrate='v'): """ @@ -66,4 +66,3 @@ def ffmpeg_resize(video,output,size): output] subprocess_call(cmd) - diff --git a/moviepy/video/io/ffmpeg_writer.py b/moviepy/video/io/ffmpeg_writer.py index 4d19968df..a4ab51949 100644 --- a/moviepy/video/io/ffmpeg_writer.py +++ b/moviepy/video/io/ffmpeg_writer.py @@ -3,14 +3,16 @@ out of VideoClips """ -import subprocess as sp import os +import subprocess as sp + import numpy as np from proglog import proglog -from moviepy.compat import PY3, DEVNULL +from moviepy.compat import DEVNULL, PY3 from moviepy.config import get_setting + class FFMPEG_VideoWriter: """ A class for FFMPEG-based video writing. diff --git a/moviepy/video/io/gif_writers.py b/moviepy/video/io/gif_writers.py index c910eea72..b17d0e666 100644 --- a/moviepy/video/io/gif_writers.py +++ b/moviepy/video/io/gif_writers.py @@ -1,12 +1,13 @@ import os import subprocess as sp -from moviepy.config import get_setting -from moviepy.decorators import (requires_duration,use_clip_fps_by_default) -from moviepy.tools import subprocess_call -import proglog + import numpy as np +import proglog from moviepy.compat import DEVNULL +from moviepy.config import get_setting +from moviepy.decorators import requires_duration, use_clip_fps_by_default +from moviepy.tools import subprocess_call try: import imageio diff --git a/moviepy/video/io/html_tools.py b/moviepy/video/io/html_tools.py index acc251a85..f24af513f 100644 --- a/moviepy/video/io/html_tools.py +++ b/moviepy/video/io/html_tools.py @@ -11,10 +11,12 @@ import os from base64 import b64encode -from moviepy.tools import extensions_dict -from ..VideoClip import VideoClip, ImageClip from moviepy.audio.AudioClip import AudioClip +from moviepy.tools import extensions_dict + +from ..VideoClip import ImageClip, VideoClip +from .ffmpeg_reader import ffmpeg_parse_infos try: from IPython.display import HTML @@ -26,7 +28,6 @@ def __add__(self, other): except ImportError: ipython_available = False -from .ffmpeg_reader import ffmpeg_parse_infos sorry = "Sorry, seems like your browser doesn't support HTML5 audio/video" templates = {"audio":("