Skip to content

Commit

Permalink
Merge pull request #410 from earney/master
Browse files Browse the repository at this point in the history
fix issue #313, make concatenate_videoclips python 3 compatible.
  • Loading branch information
Mark Beacom authored Feb 15, 2017
2 parents ceb4076 + a87b99b commit 3137695
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions moviepy/video/compositing/concatenate.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import numpy as np

import sys
PY3 = sys.version_info.major >= 3

if PY3:
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
Expand Down

0 comments on commit 3137695

Please sign in to comment.