From a027deb1e41ceedd269507ab938ee05f5113290d Mon Sep 17 00:00:00 2001

From: Carl George <carl@george.computer>

Date: Sat, 13 Oct 2018 17:25:09 -0500

Subject: [PATCH] Use standard library mock when available

---

 multipart/tests/test_multipart.py |  5 ++++-

 setup.py                          | 16 ++++++++++------

 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/multipart/tests/test_multipart.py b/multipart/tests/test_multipart.py

index dbb7ff1..decf794 100644

--- a/multipart/tests/test_multipart.py

+++ b/multipart/tests/test_multipart.py

@@ -16,7 +16,10 @@

 from io import BytesIO

 from six import binary_type, text_type

-from mock import MagicMock, Mock, patch

+try:

+    from unittest.mock import MagicMock, Mock, patch

+except ImportError:

+    from mock import MagicMock, Mock, patch

 from ..multipart import *

diff --git a/setup.py b/setup.py

index 821d337..8e90309 100755

--- a/setup.py

+++ b/setup.py

@@ -16,6 +16,15 @@

 version_re = re.compile(r'((?:\d+)\.(?:\d+)\.(?:\d+))')

 version = version_re.search(version_data).group(0)

+tests_require = [

+    'pytest',

+    'pytest-cov',

+    'PyYAML'

+]

+

+if sys.version_info[0:2] < (3, 3):

+    tests_require.append('mock')

+

 setup(name='python-multipart',

       version=version,

       description='A streaming multipart parser for Python',

@@ -27,12 +36,7 @@

       install_requires=[

           'six>=1.4.0',

       ],

-      tests_require=[

-          'pytest',

-          'pytest-cov',

-          'Mock',

-          'PyYAML'

-      ],

+      tests_require=tests_require,

       packages=[

           'multipart',

           'multipart.tests',