From 6af0a1bd1f745914b50132e056f08c2a61643731 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Mon, 22 Mar 2021 17:39:28 +0100
Subject: [PATCH] Do not require external mock on Python 3

Change-Id: Ia2c5fedbbf9b273e89b4741e124265b28688949c
---
 glean/tests/test_glean.py | 5 ++++-
 test-requirements.txt     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/glean/tests/test_glean.py b/glean/tests/test_glean.py
index e49cfc7..1e09dbe 100644
--- a/glean/tests/test_glean.py
+++ b/glean/tests/test_glean.py
@@ -17,8 +17,11 @@ import errno
 import functools
 import json
 import os
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
-import mock
 from oslotest import base
 from testscenarios import load_tests_apply_scenarios as load_tests  # noqa
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 9b9c612..5de0765 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@
 hacking>=0.9.2,<0.10
 
 coverage>=3.6
-mock>=1.0
+mock>=1.0;python_version=='2.7'
 python-subunit
 sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7'
 sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4'