Skip to content

Commit

Permalink
move PY3 variable to compat.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Billy Earney committed Feb 15, 2017
1 parent 20a70f0 commit a5a575a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 17 deletions.
7 changes: 3 additions & 4 deletions moviepy/audio/io/ffmpeg_audiowriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions moviepy/audio/io/readers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')


Expand Down
2 changes: 2 additions & 0 deletions moviepy/compat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import sys
PY3=sys.version_info.major >= 3
5 changes: 2 additions & 3 deletions moviepy/video/compositing/concatenate.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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):
Expand Down
5 changes: 3 additions & 2 deletions moviepy/video/io/ffmpeg_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')


Expand Down
8 changes: 3 additions & 5 deletions moviepy/video/io/ffmpeg_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a5a575a

Please sign in to comment.