From e5e293fca4711d15c6559ac2a4c70567d853d509 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Sun, 25 Nov 2018 21:42:43 -0600 Subject: [PATCH] Fix `mock` import for python3 --- ffmpeg/tests/test_ffmpeg.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 4f1d62e..f665e8e 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -3,13 +3,17 @@ from builtins import bytes from builtins import range from builtins import str import ffmpeg -import mock import os import pytest import random import re import subprocess +try: + import mock # python 2 +except ImportError: + from unittest import mock # python 3 + TEST_DIR = os.path.dirname(__file__) SAMPLE_DATA_DIR = os.path.join(TEST_DIR, 'sample_data')