Clean up imports with isort (#1084)

Ran `isort --recursive moviepy tests examples`

examples/dancing_knights.py

@@ -21,18 +21,18 @@
 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
 # download the videos by hand and rename them, as follows:
 #     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")
+                      audio_bitrate="1000k", bitrate="4000k")

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

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))
 

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

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')
-

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")
-

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)
+concatenate_videoclips(annotated_clips).write_videofile('tutorial.avi', fps=5)

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()
-

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.

moviepy/audio/__init__.py

@@ -1 +0,0 @@
-

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))
+    exec("from ..%s import %s" % (name, name))

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

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):

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
-

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])
-

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

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)
-

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
 

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
 

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')

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:

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)
+    return chunk_duration*np.argmax(corrs)

moviepy/compat.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 PY3=sys.version_info.major >= 3
 
 try:

moviepy/config.py

@@ -1,14 +1,15 @@
 import os
 import subprocess as sp
+
 from .compat import DEVNULL
+from .config_defaults import FFMPEG_BINARY, IMAGEMAGICK_BINARY
 
 if os.name == 'nt':
     try:
         import winreg as wr # py3k
     except ImportError:
         import _winreg as wr # py2k
 
-from .config_defaults import (FFMPEG_BINARY, IMAGEMAGICK_BINARY)
 
 def try_cmd(cmd):
     try:

moviepy/decorators.py

@@ -3,8 +3,8 @@
 """
 
 import decorator
-from moviepy.tools import cvsecs
 
+from moviepy.tools import cvsecs
 
 
 @decorator.decorator

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
 
 

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()

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

moviepy/video/__init__.py

@@ -1 +0,0 @@
-

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)
-
-

moviepy/video/compositing/__init__.py

@@ -1 +0,0 @@
-

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):