From b4cf52fc3edbde71611c7cb1842bdd348e0b935a Mon Sep 17 00:00:00 2001 From: Billy Earney Date: Mon, 20 Feb 2017 07:51:25 -0600 Subject: [PATCH 1/2] fix issue 145. raise Exception when concatenate method != chain or compose --- moviepy/video/compositing/concatenate.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py index a812b85d4..aee3d7f07 100644 --- a/moviepy/video/compositing/concatenate.py +++ b/moviepy/video/compositing/concatenate.py @@ -102,6 +102,12 @@ def make_frame(t): result = CompositeVideoClip( [c.set_start(t).set_pos('center') for (c, t) in zip(clips, tt)], size = (w, h), bg_color=bg_color, ismask=ismask) + else: + #get name of this function + import sys + _name = sys._getframe().f_code.co_name + + raise Exception("Moviepy Error: The 'method' argument of `{0}` must be 'chain' or 'compose'".format(_name)) result.tt = tt From 1bb1e3c09e1a54779816852f3df567b369d83e64 Mon Sep 17 00:00:00 2001 From: Billy Earney Date: Mon, 20 Feb 2017 08:46:10 -0600 Subject: [PATCH 2/2] make PEP8 compatible --- moviepy/video/compositing/concatenate.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py index aee3d7f07..9de94e5bd 100644 --- a/moviepy/video/compositing/concatenate.py +++ b/moviepy/video/compositing/concatenate.py @@ -103,11 +103,8 @@ def make_frame(t): for (c, t) in zip(clips, tt)], size = (w, h), bg_color=bg_color, ismask=ismask) else: - #get name of this function - import sys - _name = sys._getframe().f_code.co_name - - raise Exception("Moviepy Error: The 'method' argument of `{0}` must be 'chain' or 'compose'".format(_name)) + raise Exception("Moviepy Error: The 'method' argument of " + "concatenate_videoclips must be 'chain' or 'compose'") result.tt = tt