Address review: drop support for .pyi in browser

python · terryjreedy · Jul 30, 2022 · Jul 28, 2022 · Jul 28, 2022 · Jul 28, 2022
commit de3ba24e36c9fbb5cbafb8f07f7edb635a7985c3
@@ -15,7 +15,7 @@
 from idlelib.config import idleConf
 from idlelib import
8000
 pyshell
 from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
-from idlelib.util import is_supported_extension
+from idlelib.util import is_browseable_extension
 from idlelib.window import ListedToplevel
 
 
@@ -161,19 +161,19 @@ def GetSubList(self):
 
     def OnDoubleClick(self):
         "Open a module in an editor window when double clicked."
-        if not is_supported_extension(self.file):
+        if not is_browseable_extension(self.file):
             return
         if not os.path.exists(self.file):
             return
         file_open(self.file)
 
     def IsExpandable(self):
         "Return True if Python file."
-        return is_supported_extension(self.file)
+        return is_browseable_extension(self.file)
 
     def listchildren(self):
         "Return sequenced classes and functions in the module."
-        if not is_supported_extension(self.file):
+        if not is_browseable_extension(self.file):
             return []
         dir, base = os.path.split(self.file)
         name, _ = os.path.splitext(base)

diff --git a/Lib/idlelib/idle_test/test_util.py b/Lib/idlelib/idle_test/test_util.py
@@ -5,20 +5,28 @@
 
 
 class UtilTest(unittest.TestCase):
+    path = '/some/path/myfile'
+
     def test_is_supported_extension(self):
-        path = '/some/path/myfile'
         for ext in util.py_extensions:
             with self.subTest(ext=ext):
-                filename = f'{path}{ext}'
+                filename = f'{self.path}{ext}'
                 self.assertTrue(util.is_supported_extension(filename))
 
     def test_is_not_supported_extension(self):
-        path = '/some/path/myfile'
         for ext in '.txt', '.p', '.pyww', '.pyii', '.pyy', '':
             with self.subTest(ext=ext):
-                filename = f"{path}{ext}"
+                filename = f"{self.path}{ext}"
                 self.assertFalse(util.is_supported_extension(filename))
 
+    def test_is_browseable_extension(self):
+        for ext in util.py_extensions:
+            with self.subTest(ext=ext):
+                filename = f'{self.path}{ext}'
+                actual = util.is_browseable_extension(filename)
+                expected = ext not in util.browseable_extension_blocklist
+                self.assertEqual(actual, expected)
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/Lib/idlelib/util.py b/Lib/idlelib/util.py
@@ -19,12 +19,23 @@
 # .pyw is for Windows; .pyi is for stub files.
 py_extensions = ('.py', '.pyw', '.pyi')  # Order needed for open/save dialogs.
 
+# The browser depends on pyclbr and importlib which do not support .pyi files.
+browseable_extension_blocklist = ('.pyi',)
 
-def is_supported_extension(path):
+
+def _get_ext(path):
     _, ext = os.path.splitext(path)
-    if not ext:
-        return False
-    return os.path.normcase(ext) in py_extensions
+    return os.path.normcase(ext)
+
+
+def is_supported_extension(path):
+    ext = _get_ext(path)
+    return ext in py_extensions
+
+
+def is_browseable_extension(path):
+    ext = _get_ext(path)
+    return ext in py_extensions and ext not in browseable_extension_blocklist
 
 
 if __name__ == '__main__':