From 43ab7c88d7604d7c9b6f59d5eb15a21699879c42 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Thu, 28 Nov 2019 16:52:56 -0800
Subject: [PATCH] Remove os_environ() context manager

---
 src/ocrmypdf/_graft.py |  2 +-
 tests/conftest.py      | 25 -------------------------
 tests/test_graft.py    |  7 ++-----
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/ocrmypdf/_graft.py b/src/ocrmypdf/_graft.py
index 6a7cf23a..a535d492 100644
--- a/src/ocrmypdf/_graft.py
+++ b/src/ocrmypdf/_graft.py
@@ -21,7 +21,7 @@ from pathlib import Path
 
 import pikepdf
 
-MAX_REPLACE_PAGES = int(os.environ.get('_OCRMYPDF_MAX_REPLACE_PAGES', 100))
+MAX_REPLACE_PAGES = 100
 
 
 def _update_page_resources(*, page, font, font_key, procset):
diff --git a/tests/conftest.py b/tests/conftest.py
index 9f796d3a..3a2850a4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,7 +18,6 @@
 import os
 import platform
 import sys
-from contextlib import contextmanager
 from pathlib import Path
 from subprocess import PIPE, run
 from ocrmypdf import api, cli
@@ -107,30 +106,6 @@ def spoof(tmp_path_factory, **kwargs):
     return env
 
 
-@pytest.helpers.register
-@contextmanager
-def os_environ(new_env):
-    old_env = os.environ.copy()
-    if new_env is None:
-        new_env = {}
-
-    for k, v in new_env.items():
-        if k != 'PYTEST_CURRENT_TEST':
-            os.environ[k] = v
-    yield
-    new_keys = set(os.environ.copy()) - set(old_env)
-    for k in new_keys:
-        if k != 'PYTEST_CURRENT_TEST':
-            del os.environ[k]
-    for k in old_env:
-        if k != 'PYTEST_CURRENT_TEST':
-            os.environ[k] = old_env[k]
-
-    for k, v in os.environ.copy().items():
-        if k != 'PYTEST_CURRENT_TEST':
-            assert v == old_env[k]
-
-
 @pytest.fixture(scope='session')
 def spoof_tesseract_noop(tmp_path_factory):
     return spoof(tmp_path_factory, tesseract='tesseract_noop.py')
diff --git a/tests/test_graft.py b/tests/test_graft.py
index 2fd3d480..52aa336c 100644
--- a/tests/test_graft.py
+++ b/tests/test_graft.py
@@ -16,14 +16,13 @@
 # along with OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+from unittest.mock import patch
 
 import pytest
 
 import ocrmypdf
 import pikepdf
 
-os_environ = pytest.helpers.os_environ
-
 
 def test_no_glyphless_graft(resources, outdir):
     pdf = pikepdf.open(resources / 'francais.pdf')
@@ -33,9 +32,7 @@ def test_no_glyphless_graft(resources, outdir):
     pdf.pages.extend(pdf_cmyk.pages)
     pdf.save(outdir / 'test.pdf')
 
-    env = os.environ.copy()
-    env['_OCRMYPDF_MAX_REPLACE_PAGES'] = '2'
-    with os_environ(env):
+    with patch('ocrmypdf._graft.MAX_REPLACE_PAGES', 2):
         ocrmypdf.ocr(
             outdir / 'test.pdf', outdir / 'out.pdf', deskew=True, tesseract_timeout=0
         )