Tweak application for being able to run in a frozen environment

We need to change the way backend is running in a frozen environment:

- If no external interpreter is found, we must freeze the server script and use it without interpreters
- If the user choose an external interpreter, we must use server.py next that sits next to our frozen executable and add library.zip to sys.path (so that the user does not have to install pyqode in the target environment)

Author: ColinDuquesnoy

examples/pynotepad/pynotepad/__init__.py

@@ -18,6 +18,9 @@
 
 
 def main():
+    if hasattr(sys, 'frozen'):
+        sys.stdout = open('pynotepad_stdout.txt', 'w')
+        sys.stderr = open('pynotepad_stderr.txt', 'w')
     app = QApplication(sys.argv)
     if not Settings().interpreter:
         Settings().interpreter = sys.executable

examples/pynotepad/pynotepad/main_window.py

@@ -28,7 +28,8 @@ def __init__(self):
         self.setup_actions()
         self.setup_status_bar_widgets()
         self.on_current_tab_changed()
-        self.intepreter_group = QtWidgets.QActionGroup(self.menuPython_interpreter)
+        self.intepreter_group = QtWidgets.QActionGroup(
+            self.menuPython_interpreter)
         for interpreter in get_interpreters():
             a = self.menuPython_interpreter.addAction(interpreter)
             a.setCheckable(True)
@@ -43,8 +44,9 @@ def on_interpreter_toggled(self, action):
         interpreter = action.text()
         for editor in self.tabWidget.widgets(include_clones=True):
             editor.backend.stop()
-            editor.backend.start(editor.backend.server_script,
-                                 interpreter=interpreter, args=editor.backend.args)
+            editor.backend.start(
+                editor.backend.server_script,
+                interpreter=interpreter, args=editor.backend.args)
         Settings().interpreter = interpreter
 
     def setup_status_bar_widgets(self):
@@ -74,8 +76,10 @@ def setup_actions(self):
         self.actionConfigure_run.triggered.connect(self.on_configure_run)
 
     def _enable_run(self):
-        self.actionRun.setEnabled(self.tabWidget.current_widget().file.path != '')
-        self.actionConfigure_run.setEnabled(self.tabWidget.current_widget().file.path != '')
+        self.actionRun.setEnabled(
+            self.tabWidget.current_widget().file.path != '')
+        self.actionConfigure_run.setEnabled(
+            self.tabWidget.current_widget().file.path != '')
 
     def setup_recent_files_menu(self):
         """ Setup the recent files menu and manager """
@@ -121,8 +125,10 @@ def open_file(self, path, line=None):
         """
         editor = None
         if path:
+            interpreter, pyserver, args = self._get_backend_parameters()
             editor = self.tabWidget.open_document(
-                path, interpreter=Settings().interpreter)
+                path, None, interpreter=interpreter, server_script=pyserver,
+                args=args)
             if editor:
                 self.setup_editor(editor)
             self.recent_files_manager.open_file(path)
@@ -131,13 +137,31 @@ def open_file(self, path, line=None):
             TextHelper(self.tabWidget.current_widget()).goto_line(line)
         return editor
 
+    def _get_backend_parameters(self):
+        """
+        Gets the pyqode backend parameters (interpreter and script).
+        """
+        frozen = hasattr(sys, 'frozen')
+        interpreter = Settings().interpreter
+        if frozen and interpreter == sys.executable:
+            interpreter = None
+        pyserver = server.__file__ if interpreter is not None else 'server.exe'
+        args = []
+        if interpreter and frozen:
+            pyserver = 'server.py'
+            args.append('--syspath')
+            args.append(os.path.join(os.getcwd(), 'library.zip'))
+        return interpreter, pyserver, args
+
     @QtCore.Slot()
     def on_new(self):
         """
         Add a new empty code editor to the tab widget
         """
+        interpreter, pyserver, args = self._get_backend_parameters()
         self.setup_editor(self.tabWidget.create_new_document(
-            extension='.py', interpreter=Settings().interpreter))
+            extension='.py', interpreter=interpreter, server_script=pyserver,
+            args=args))
         self.actionRun.setDisabled(True)
         self.actionConfigure_run.setDisabled(True)