From a5a575a2bf7997b45682edc25be3214f505e9340 Mon Sep 17 00:00:00 2001 From: Billy Earney Date: Wed, 15 Feb 2017 12:08:56 -0600 Subject: [PATCH] move PY3 variable to compat.py --- moviepy/audio/io/ffmpeg_audiowriter.py | 7 +++---- moviepy/audio/io/readers.py | 6 +++--- moviepy/compat.py | 2 ++ moviepy/video/compositing/concatenate.py | 5 ++--- moviepy/video/io/ffmpeg_reader.py | 5 +++-- moviepy/video/io/ffmpeg_writer.py | 8 +++----- 6 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 moviepy/compat.py diff --git a/moviepy/audio/io/ffmpeg_audiowriter.py b/moviepy/audio/io/ffmpeg_audiowriter.py index 81bc88848..9154a460e 100644 --- a/moviepy/audio/io/ffmpeg_audiowriter.py +++ b/moviepy/audio/io/ffmpeg_audiowriter.py @@ -2,13 +2,12 @@ import numpy as np import subprocess as sp -import sys -PY3=sys.version_info.major >= 3 +from movie.compat import PY3 import os -try: +if PY3: from subprocess import DEVNULL # py3k -except ImportError: +else: DEVNULL = open(os.devnull, 'wb') from tqdm import tqdm diff --git a/moviepy/audio/io/readers.py b/moviepy/audio/io/readers.py index 378c3c891..f2e1901dc 100644 --- a/moviepy/audio/io/readers.py +++ b/moviepy/audio/io/readers.py @@ -6,11 +6,11 @@ from moviepy.video.io.ffmpeg_reader import ffmpeg_parse_infos from moviepy.config import get_setting - +from moviepy.compat import PY3 import os -try: +if PY3: from subprocess import DEVNULL # py3k -except ImportError: +else: DEVNULL = open(os.devnull, 'wb') diff --git a/moviepy/compat.py b/moviepy/compat.py new file mode 100644 index 000000000..9e94a810a --- /dev/null +++ b/moviepy/compat.py @@ -0,0 +1,2 @@ +import sys +PY3=sys.version_info.major >= 3 diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py index 3d94aa255..86ea2cdf0 100644 --- a/moviepy/video/compositing/concatenate.py +++ b/moviepy/video/compositing/concatenate.py @@ -1,7 +1,6 @@ import numpy as np -import sys -PY3 = sys.version_info.major >= 3 +from moviepy.compat import PY3 if PY3: from functools import reduce @@ -11,7 +10,7 @@ from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip from moviepy.audio.AudioClip import CompositeAudioClip -from moviepy.video.compositing.on_color import on_color +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/io/ffmpeg_reader.py b/moviepy/video/io/ffmpeg_reader.py index 420eed103..04b2f8250 100644 --- a/moviepy/video/io/ffmpeg_reader.py +++ b/moviepy/video/io/ffmpeg_reader.py @@ -15,11 +15,12 @@ import numpy as np from moviepy.config import get_setting # ffmpeg, ffmpeg.exe, etc... from moviepy.tools import cvsecs +from moviepy.compat import PY3 import os -try: +if PY3: from subprocess import DEVNULL # py3k -except ImportError: +else: DEVNULL = open(os.devnull, 'wb') diff --git a/moviepy/video/io/ffmpeg_writer.py b/moviepy/video/io/ffmpeg_writer.py index edf1b9fd9..2756b0a85 100644 --- a/moviepy/video/io/ffmpeg_writer.py +++ b/moviepy/video/io/ffmpeg_writer.py @@ -7,13 +7,11 @@ import os import numpy as np -import sys +from moviepy.compat import PY3 -PY3 = sys.version_info.major >=3 - -try: +if PY3: from subprocess import DEVNULL # py3k -except ImportError: +else: DEVNULL = open(os.devnull, 'wb') from moviepy.config import get_setting