Re-establish try/except for file open errors after Micropython glitch has been fixed

Author: robert-hh

README.md

@@ -92,3 +92,6 @@ c) expandtabs() and packtabs() with a second argument for tabsize (not for pye,
 - Removed skipping to the adjacent line with Right/Left in the WiPy Version
 - Temporary avoidance of the memory leak when a file is not found
 
+**1.7c** Re-establish try-except for file-not-found error
+- Removed the temporary fix for memory corruption by exception for file-not-found error
+- Changed string formatting to Python3 style

pe.py

@@ -317,8 +317,7 @@ def handle_cursor_keys(self, key):
                 self.cur_line = max(self.cur_line, self.top_line)
                 self.scroll_down(3)
         elif key == 0x01: 
-            pat = self.line_edit("Case Sensitive Search %c, Autoindent %c, Tab Size %d, Write Tabs %c: " %
-                  (self.case, self.autoindent, self.tab_size, self.write_tabs), "")
+            pat = self.line_edit("Case Sensitive Search {}, Autoindent {}, Tab Size {}, Write Tabs {}: ".format(self.case, self.autoindent, self.tab_size, self.write_tabs), "")
             try:
                 res = [i.strip().lower() for i in pat.split(",")]
                 if res[0]: self.case = 'y' if res[0][0] == 'y' else 'n'
@@ -562,12 +561,11 @@ def packtabs(self, s):
                 sb.write(c)
         return sb.getvalue()
     def get_file(self, fname):
-        from os import listdir
-        if fname in listdir():
+        try:
                 with open(fname) as f:
                     content = f.readlines()
-        else:
-            message = 'File {!r} is not in the local directory'.format(fname)
+        except Exception as err:
+            message = 'Could not load {}, {!r}'.format(fname, err)
             return (None, message)
         for i in range(len(content)): 
             content[i] = self.expandtabs(content[i].rstrip('\r\n\t '))

pemin.py

@@ -408,12 +408,11 @@ def expandtabs(self, s):
         else:
             return s
     def get_file(self, fname):
-        from os import listdir
-        if fname in listdir():
+        try:
                 with open(fname) as f:
                     content = f.readlines()
-        else:
-            message = 'File {!r} is not in the local directory'.format(fname)
+        except Exception as err:
+            message = 'Could not load {}, {!r}'.format(fname, err)
             return (None, message)
         for i in range(len(content)): 
             content[i] = self.expandtabs(content[i].rstrip('\r\n\t '))

pye.py

@@ -524,8 +524,7 @@ def handle_cursor_keys(self, key): ## keys which move, sanity checks later
                 self.cur_line = max(self.cur_line, self.top_line)
                 self.scroll_down(3)
         elif key == KEY_TOGGLE: ## Toggle Autoindent/Statusline/Search case
-            pat = self.line_edit("Case Sensitive Search %c, Autoindent %c, Tab Size %d, Write Tabs %c: " %
-                  (self.case, self.autoindent, self.tab_size, self.write_tabs), "")
+            pat = self.line_edit("Case Sensitive Search {}, Autoindent {}, Tab Size {}, Write Tabs {}: ".format(self.case, self.autoindent, self.tab_size, self.write_tabs), "")
             try:
                 res =  [i.strip().lower() for i in pat.split(",")]
                 if res[0]: self.case       = 'y' if res[0][0] == 'y' else 'n'
@@ -801,8 +800,7 @@ def packtabs(self, s):
         return sb.getvalue()
 #endif
     def get_file(self, fname):
-        from os import listdir
-        if fname in listdir():
+        try:
 #ifdef LINUX
             if sys.implementation.name == "cpython":
                 with open(fname, errors="ignore") as f:
@@ -811,8 +809,8 @@ def get_file(self, fname):
 #endif
                 with open(fname) as f:
                     content = f.readlines()
-        else:
-            message = 'File {!r} is not in the local directory'.format(fname)
+        except Exception as err:
+            message = 'Could not load {}, {!r}'.format(fname, err)
             return (None, message)
         for i in range(len(content)):  ## strip and convert
             content[i] = self.expandtabs(content[i].rstrip('\r\n\t '))

tuning_pye.py

@@ -121,26 +121,7 @@ def packtabs(s, tabsize = 8):
     @staticmethod
     def cls():
         Editor.wr(b"\x1b[2J")
-#
-# This is a safe place for the initial get_file function, which is replaced by another one
-# until the MiPy error about stalling about non-existing files is solved
-#
-    def get_file(self, fname):
-        try:
-#ifdef LINUX
-            if sys.implementation.name == "cpython":
-                with open(fname, errors="ignore") as f:
-                    content = f.readlines()
-            else:
-#endif
-                with open(fname) as f:
-                    content = f.readlines()
-        except Exception as err:
-            message = 'Could not load {}, {!r}'.format(fname, err)
-            return (None, message)
-        for i in range(len(content)):  ## strip and convert
-            content[i] = self.expandtabs(content[i].rstrip('\r\n\t '))
-        return (content, "")
+
 
 
 

wipye.py

@@ -414,12 +414,11 @@ def expandtabs(self, s):
         else:
             return s
     def get_file(self, fname):
-        from os import listdir
-        if fname in listdir():
+        try:
                 with open(fname) as f:
                     content = f.readlines()
-        else:
-            message = 'File {!r} is not in the local directory'.format(fname)
+        except Exception as err:
+            message = 'Could not load {}, {!r}'.format(fname, err)
             return (None, message)
         for i in range(len(content)): 
             content[i] = self.expandtabs(content[i].rstrip('\r\n\t '))