fallback for monkeypatch in python 3.5

Author: muru

tests/test_auth_providers.py

@@ -49,7 +49,7 @@
 
 @pytest.fixture(scope='module', params=[{'emulated': False}, {'emulated': True}])
 def user_mgt_app(request):
-    monkeypatch = pytest.MonkeyPatch()
+    monkeypatch = testutils.new_monkeypatch()
     if request.param['emulated']:
         monkeypatch.setenv(EMULATOR_HOST_ENV_VAR, AUTH_EMULATOR_HOST)
         monkeypatch.setitem(USER_MGT_URLS, 'ID_TOOLKIT', EMULATED_ID_TOOLKIT_URL)

tests/test_token_gen.py

@@ -148,7 +148,7 @@ def auth_app(request):
     This can be used in any scenario where the private key is required. Use user_mgt_app
     for everything else.
     """
-    monkeypatch = pytest.MonkeyPatch()
+    monkeypatch = testutils.new_monkeypatch()
     if request.param['emulated']:
         monkeypatch.setenv(EMULATOR_HOST_ENV_VAR, AUTH_EMULATOR_HOST)
         monkeypatch.setitem(TOKEN_MGT_URLS, 'ID_TOOLKIT', EMULATED_ID_TOOLKIT_URL)
@@ -159,7 +159,7 @@ def auth_app(request):
 
 @pytest.fixture(scope='module', params=[{'emulated': False}, {'emulated': True}])
 def user_mgt_app(request):
-    monkeypatch = pytest.MonkeyPatch()
+    monkeypatch = testutils.new_monkeypatch()
     if request.param['emulated']:
         monkeypatch.setenv(EMULATOR_HOST_ENV_VAR, AUTH_EMULATOR_HOST)
         monkeypatch.setitem(TOKEN_MGT_URLS, 'ID_TOOLKIT', EMULATED_ID_TOOLKIT_URL)

tests/test_user_mgt.py

@@ -62,7 +62,7 @@
 
 @pytest.fixture(scope='module', params=[{'emulated': False}, {'emulated': True}])
 def user_mgt_app(request):
-    monkeypatch = pytest.MonkeyPatch()
+    monkeypatch = testutils.new_monkeypatch()
     if request.param['emulated']:
         monkeypatch.setenv(EMULATOR_HOST_ENV_VAR, AUTH_EMULATOR_HOST)
         monkeypatch.setitem(USER_MGT_URLS, 'ID_TOOLKIT', EMULATED_ID_TOOLKIT_URL)

tests/testutils.py

@@ -16,6 +16,8 @@
 import io
 import os
 
+import pytest
+
 from google.auth import credentials
 from google.auth import transport
 from requests import adapters
@@ -58,6 +60,15 @@ def run_without_project_id(func):
                 os.environ[env_var] = gcloud_project
 
 
+def new_monkeypatch():
+    try:
+        return pytest.MonkeyPatch()
+    except AttributeError:
+        # Fallback for Python 3.5
+        from _pytest.monkeypatch import MonkeyPatch
+        return MonkeyPatch()
+
+
 class MockResponse(transport.Response):
     def __init__(self, status, response):
         self._status = status