Mercurial > lcfOS

changeset 65:361f7d13adea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes after movage
author windel
date Sun, 07 Oct 2012 17:21:08 +0200
parents 4a27c28c7d0f
children bcd55a341512
files python/apps/build.py python/apps/ide.py python/apps/ide/ide.py python/libs/compiler/__init__.py
diffstat 4 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/python/apps/build.py	Sun Oct 07 17:13:47 2012 +0200
+++ b/python/apps/build.py	Sun Oct 07 17:21:08 2012 +0200
@@ -1,9 +1,8 @@
 import sys, os
-
 sys.path.insert(0, os.path.join('..','libs'))
-print(sys.path)
+
 # Compiler imports:
-from compiler.compiler import Compiler
+from compiler import Compiler
 from project import Project
 
 if __name__ == '__main__':
--- a/python/apps/ide.py	Sun Oct 07 17:13:47 2012 +0200
+++ b/python/apps/ide.py	Sun Oct 07 17:21:08 2012 +0200
@@ -1,16 +1,14 @@
-import sys
+import sys, os
+sys.path.insert(0, os.path.join('..','libs'))
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-# ide components:
-from .codeeditor import CodeEdit
-from .astviewer import AstViewer
 import base64
-import os.path
 
 # Compiler imports:
 from project import Project
-from compiler.compiler import Compiler
+from compiler import Compiler
+from widgets import CodeEdit, AstViewer
 
 lcfospng = base64.decodestring(b'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A\n/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJEhMKBk7B678AAAA/SURBVFjD\n7dbBCQAgDATBi9h/y7EFA4Kf2QLCwH1S6XQu6sqoujublc8BAAAAAAAAAAB8B+zXT6YJAAAAAKYd\nWSgFQNUyijIAAAAASUVORK5CYII=\n')
 
--- a/python/apps/ide/ide.py	Sun Oct 07 17:13:47 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
--- a/python/libs/compiler/__init__.py	Sun Oct 07 17:13:47 2012 +0200
+++ b/python/libs/compiler/__init__.py	Sun Oct 07 17:21:08 2012 +0200
@@ -1,2 +1,4 @@
 # File to make this directory a package.
 
+from .compiler import Compiler
+