more defensive

Author: blueyed

pyrepl/reader.py

@@ -478,8 +478,8 @@ def prepare(self):
         """Get ready to run.  Call restore when finished.  You must not
         write to the console in between the calls to prepare and
         restore."""
-        self.console.prepare()
         try:
+            self.console.prepare()
             self.arg = None
             self.screeninfo = []
             self.finished = 0

pyrepl/unix_console.py

@@ -359,6 +359,7 @@ def prepare(self):
         except termios.error:  # (25, 'Inappropriate ioctl for device')
             # assert not os.fdopen(self.input_fd).isatty()
             raise EOFError
+        self._prepared = True
         raw = self.__svtermstate.copy()
         raw.iflag |= termios.ICRNL
         raw.iflag &= ~(termios.BRKINT | termios.INPCK |
@@ -390,6 +391,9 @@ def prepare(self):
             pass
 
     def restore(self):
+        if not hasattr(self, '_prepared'):
+            return
+        del self._prepared
         self.__maybe_write_code(self._rmkx)
         self.flushoutput()
         tcsetattr(self.input_fd, termios.TCSADRAIN, self.__svtermstate)