address review: move test_guido_as_bdfl_ineq_tokens()

Author: skirpichev

Lib/test/test_flufl.py

@@ -58,31 +58,6 @@ def test_barry_as_bdfl_relative_import(self):
         self.assertEqual(cm.exception.lineno, 1)
         self.assertEqual(cm.exception.offset, len(code) - 4)
 
-    def test_guido_as_bdfl_ineq_tokens(self):
-        code = """
-from io import BytesIO
-import tokenize
-from test.test_tokenize import stringify_tokens_from_source
-
-s = "{0}"
-f = BytesIO(s.encode('utf-8'))
-globals()['result'] = stringify_tokens_from_source(tokenize.tokenize(f.readline), s)
-"""
-        ns = {}
-        exec(code.format('1 != 2'), ns)
-        self.assertEqual(ns['result'],
-                         ["    ENCODING   'utf-8'       (0, 0) (0, 0)",
-                          "    NUMBER     '1'           (1, 0) (1, 1)",
-                          "    OP         '!='          (1, 2) (1, 4)",
-                          "    NUMBER     '2'           (1, 5) (1, 6)"])
-        exec(code.format('1 <> 2'), ns)
-        self.assertEqual(ns['result'],
-                         ["    ENCODING   'utf-8'       (0, 0) (0, 0)",
-                          "    NUMBER     '1'           (1, 0) (1, 1)",
-                          "    OP         '<'           (1, 2) (1, 3)",
-                          "    OP         '>'           (1, 3) (1, 4)",
-                          "    NUMBER     '2'           (1, 5) (1, 6)"])
-
 
 if __name__ == '__main__':
     unittest.main()

Lib/test/test_tokenize.py

@@ -1233,6 +1233,20 @@ def test_multiline_non_ascii_fstring_with_expr(self):
     FSTRING_END \'"\'           (2, 2) (2, 3)
     """)
 
+    def test_ineq_tokens(self):
+        self.check_tokenize("1 != 2", """\
+    NUMBER     '1'           (1, 0) (1, 1)
+    OP         '!='          (1, 2) (1, 4)
+    NUMBER     '2'           (1, 5) (1, 6)
+""")
+        self.check_tokenize("1 <> 2", """\
+    NUMBER     '1'           (1, 0) (1, 1)
+    OP         '<'           (1, 2) (1, 3)
+    OP         '>'           (1, 3) (1, 4)
+    NUMBER     '2'           (1, 5) (1, 6)
+""")
+
+
 class GenerateTokensTest(TokenizeTest):
     def check_tokenize(self, s, expected):
         # Format the tokens in s in a table format.