repair incomplete commit from last PR (sry) (#125)

plone · Aug 29, 2019 · 8275f5b · 8275f5b
1 parent c76e817
commit 8275f5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/news/122.bugfix b/news/122.bugfix
@@ -1 +1 @@
-Fixed a deprecation warning when importing "makerequest" from Testing.ZopeTestCase.utils. This also fixes a side effect which can bite you if you rely on ZOPETESTCASE environment variable, only being set to "1" during test runs.
+Fixed a deprecation warning when importing `makerequest` from Testing.ZopeTestCase.utils. This also fixes a side effect which can bite you if you rely on ZOPETESTCASE environment variable, only being set to `1` during test runs.
diff --git a/src/plone/recipe/zope2instance/ctl.py b/src/plone/recipe/zope2instance/ctl.py
@@ -679,7 +679,7 @@ def get_startup_cmd(self, python, more, pyflags=""):
         if not self.options.no_request:
             cmdline += (
                 'from Testing.makerequest import makerequest; '
-                'app = Testing.makerequest.makerequest(app); '
+                'app = makerequest(app); '
                 # REQUEST.traverse needs this but no reason not to set
                 # this even if we're not traversing to an object
                 'app.REQUEST[\'PARENTS\'] = [app]; '
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Fixed a deprecation warning when importing "makerequest" from Testing.ZopeTestCase.utils. This also fixes a side effect which can bite you if you rely on ZOPETESTCASE environment variable, only being set to "1" during test runs.
		Fixed a deprecation warning when importing `makerequest` from Testing.ZopeTestCase.utils. This also fixes a side effect which can bite you if you rely on ZOPETESTCASE environment variable, only being set to `1` during test runs.