Add fake pyb on windows, create installer v1.0-rc2

martinribelotta · martinribelotta · commit ef3445d71c47 · 2016-09-11T04:13:52.000-03:00
Signed-off-by: Martin Ribelotta &lt;martinribelotta@gmail.com&gt;
diff --git a/mk_install.nsi b/mk_install.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "uPyIDE"
-!define PRODUCT_VERSION "1.0-rc1"
+!define PRODUCT_VERSION "1.0-rc2"
 !define PRODUCT_PUBLISHER "None"
 !define PRODUCT_WEB_SITE "https://github.com/martinribelotta/uPyIDE"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\EjecutablePrincipal.exe"
diff --git a/share/uPyIDE/fakelibs/pyb.py b/share/uPyIDE/fakelibs/pyb.py
diff --git a/share/uPyIDE/help.css b/share/uPyIDE/help.css
@@ -0,0 +1,3 @@
+h1 {
+    color: blue;
+}
diff --git a/share/uPyIDE/help.html b/share/uPyIDE/help.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+    <h1>uPyIDE Help</h1>
+    <ul>
+        <li>TODO</li>
+    </ul>
+</body>
+</html>
diff --git a/share/uPyIDE/help.md b/share/uPyIDE/help.md
@@ -0,0 +1,3 @@
+*** uPyIDE ***
+
+  - TODO
diff --git a/share/uPyIDE/images/about.png b/share/uPyIDE/images/about.png
diff --git a/src/server.py b/src/server.py
@@ -20,7 +20,7 @@
 import argparse
 import logging
 import sys
-import inspect
+
 
 if __name__ == '__main__':
     """
@@ -37,17 +37,12 @@
     # add user paths to sys.path
     if args.syspath:
         for path in args.syspath:
-            print('append path %s to sys.path' % path)
+            print(('append path %s to sys.path' % path))
             sys.path.append(path)
 
     from pyqode.core import backend
     from pyqode.python.backend.workers import JediCompletionProvider
 
-    try:
-        import pyb as fake_pyb
-        sys.path.append(inspect.getfile(fake_pyb))
-    except:
-        pass
     # setup completion providers
     backend.CodeCompletionWorker.providers.append(JediCompletionProvider())
     backend.CodeCompletionWorker.providers.append(
diff --git a/src/uPyIDE.py b/src/uPyIDE.py
@@ -3,7 +3,6 @@
 import os
 import re
 import sys
-import base64
 import glob
 import collections
 
@@ -43,6 +42,10 @@ def share():
                                         '..', 'share', 'uPyIDE'))
 
 
+def fakelibs():
+    return os.path.join(share(), 'fakelibs')
+
+
 def icon(name):
     path = os.path.join(share(), 'images', '{}.png'.format(name))
     return QtGui.QIcon(path)
@@ -255,9 +258,13 @@ def closeEvent(self, event):
         if event.isAccepted():
             self.terminate()
 
+    def createEditor(self):
+        return widgets.PyCodeEdit(interpreter=backend_interpreter(),
+            server_script=completion_server(),
+            args=['-s', fakelibs()])
+
     def fileNew(self):
-        code_edit = widgets.PyCodeEdit(interpreter=backend_interpreter(),
-                                       server_script=completion_server())
+        code_edit = self.createEditor()
         i = self.tabber.add_code_edit(code_edit, i18n("NewFile.py (%d)"))
         self.tabber.setCurrentIndex(i)
 
@@ -287,7 +294,7 @@ def fileOpen(self):
             self, i18n("Open File"), self.cwd,
             i18n("Python files (*.py);;All files (*)"))
         if name:
-            code_edit = widgets.PyCodeEdit(server_script=server.__file__)
+            code_edit = self.createEditor()
             code_edit.file.open(name)
             i = self.tabber.add_code_edit(code_edit)
             self.tabber.setCurrentIndex(i)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +<html>
 +<body>
 +    <h1>uPyIDE Help</h1>
 +    <ul>
 +        <li>TODO</li>
 +    </ul>
 +</body>
 +</html>