diff --git a/AUTHORS b/AUTHORS index 3edfdcf85..ebdcf728e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -157,6 +157,7 @@ Oleg Sushchenko Oliver Bestwalter Omar Kohl Omer Hadari +Ondřej Súkup Patrick Hayes Paweł Adamczak Pedro Algarvio diff --git a/testing/test_mark.py b/testing/test_mark.py index e2e7369dc..17349916e 100644 --- a/testing/test_mark.py +++ b/testing/test_mark.py @@ -1,7 +1,11 @@ from __future__ import absolute_import, division, print_function import os import sys -import mock + +try: + import mock +except ImportError: + import unittest.mock as mock import pytest from _pytest.mark import ( MarkGenerator as Mark,