From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 5 Jun 2020 02:42:44 +0000 (-0400)
Subject: [3.8] bpo-40807: Backport test_codeop change [GH-19670]
X-Git-Tag: v3.8.4rc1~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5d6aba318ead9cc756ba750a70da41f5def3f8f;p=thirdparty%2FPython%2Fcpython.git

[3.8] bpo-40807: Backport test_codeop change [GH-19670]

A tiny sliver of a 3.9 PEG parser patch needed to backport the test added by #20486.
---

diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py
index 98da26fa5dab..4d52d15fa0fb 100644
--- a/Lib/test/test_codeop.py
+++ b/Lib/test/test_codeop.py
@@ -3,12 +3,12 @@
    Nick Mathewson
 """
 import unittest
-from test.support import is_jython
+from test import support
 
 from codeop import compile_command, PyCF_DONT_IMPLY_DEDENT
 import io
 
-if is_jython:
+if support.is_jython:
     import sys
 
     def unify_callables(d):
@@ -21,7 +21,7 @@ class CodeopTests(unittest.TestCase):
 
     def assertValid(self, str, symbol='single'):
         '''succeed iff str is a valid piece of code'''
-        if is_jython:
+        if support.is_jython:
             code = compile_command(str, "<input>", symbol)
             self.assertTrue(code)
             if symbol == "single":
@@ -60,7 +60,7 @@ class CodeopTests(unittest.TestCase):
         av = self.assertValid
 
         # special case
-        if not is_jython:
+        if not support.is_jython:
             self.assertEqual(compile_command(""),
                              compile("pass", "<input>", 'single',
                                      PyCF_DONT_IMPLY_DEDENT))