mirror of
https://github.com/kkroening/ffmpeg-python.git
synced 2025-04-06 04:15:44 +08:00
Fix mock
import for python3
This commit is contained in:
parent
462e34bab3
commit
e5e293fca4
@ -3,13 +3,17 @@ from builtins import bytes
|
|||||||
from builtins import range
|
from builtins import range
|
||||||
from builtins import str
|
from builtins import str
|
||||||
import ffmpeg
|
import ffmpeg
|
||||||
import mock
|
|
||||||
import os
|
import os
|
||||||
import pytest
|
import pytest
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
|
try:
|
||||||
|
import mock # python 2
|
||||||
|
except ImportError:
|
||||||
|
from unittest import mock # python 3
|
||||||
|
|
||||||
|
|
||||||
TEST_DIR = os.path.dirname(__file__)
|
TEST_DIR = os.path.dirname(__file__)
|
||||||
SAMPLE_DATA_DIR = os.path.join(TEST_DIR, 'sample_data')
|
SAMPLE_DATA_DIR = os.path.join(TEST_DIR, 'sample_data')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user