Trying to allow Expression to work again (but doesn't work yet).

.cvsignore

@@ -4,4 +4,5 @@
 *.prj
 *.pws
 *.pyc
+build
 locale

setup.py

@@ -60,4 +60,6 @@ setup(name = "Expression",
                      for classifier in classifiers.split("\n")
                      if classifier],
       long_description = "\n".join(docLines[2:]),
-      py_modules = ["expression"])
+      package_dir = {"": "src"},
+      packages = ["expression", "expression/core", "expression/modules"],
+      scripts = ["src/expression.py"])

src/core/main.py

@@ -41,30 +41,25 @@ import urllib
 
 import libxml2
 
-# Changed by "make install".
-expressionPythonDirectoryPath = "/usr/local/lib/expression-devel"
-sys.path.insert(0, expressionPythonDirectoryPath)
-
 import expression
-
+import expression.core,configurations as configurations
-import expression.configurations as configurations
+import expression.core.dataholders as dataholders
-import expression.dataholders as dataholders
+import expression.core.elements as elements
-import expression.elements as elements
+import expression.core.environs as environs
-import expression.environs as environs
+import expression.core.faults as faults
-import expression.faults as faults
+import expression.core.filesystems as filesystems
-import expression.filesystems as filesystems
+import expression.core.html as html
-import expression.html as html
+import expression.core.http as http
-import expression.http as http
+import expression.core.httpstatuses as httpstatuses
-import expression.httpstatuses as httpstatuses
+import expression.core.logs as logs
-import expression.logs as logs
+import expression.core.locations as locations
-import expression.locations as locations
+import expression.core.modules as modules
-import expression.modules as modules
+import expression.core.namespaces as namespaces
-import expression.namespaces as namespaces
+import expression.core.stations as stations
-import expression.stations as stations
+import expression.core.steps as steps
-import expression.steps as steps
+import expression.core.stylesheets as stylesheets
-import expression.stylesheets as stylesheets
+import expression.core.xpaths as xpaths
-import expression.xpaths as xpaths
+import expression.core.xslt as xslt
-import expression.xslt as xslt
 
 
 def goDaemon(nochdir = 0, noclose = 0, user = None, group = None):