Merge pull request #261 from aktech/fix-broken-master

tests/test_interactive.py

@@ -2452,7 +2452,10 @@ def test_complete_symbol_bad_as_1(frontend, tmp):
     )
 
 
-
+@pytest.mark.skipif(
+    sys.version_info < (3, 8),
+    reason="We're dropping support for 3, 7 anyways",
+)
 @retry
 def test_complete_symbol_nonmodule_1(frontend, tmp):
     # Verify that completion works even if a module replaced itself in
@@ -2488,14 +2491,11 @@ def island(self):
     ipython(
             """
             In [1]: import pyflyby; pyflyby.enable_auto_importer()
-            In [2]: print(gravesend60063\t393.r\t
-            [PYFLYBY] import gravesend60063393{}
-            In [2]: print(gravesend60063393.river)
-            in the river
+            [PYFLYBY] import gravesend60063393
+            In [2]: print(gravesend60063\t393.r\tiver){}
             in the river
             Medway
-            ... the island
-            In [3]: print(gravesend600633\t93.is\tland)
+            In [3]: print(gravesend600633\t93.isl\tand)
             on the island
             on the island
             Canvey