merge stable
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Fri, 07 May 2010 16:50:09 +0200
branchstable
changeset 5501 1af69779f597
parent 5498 eab5540d96eb (current diff)
parent 5500 55a40cc0ab9a (diff)
child 5502 c342531032a1
merge
--- a/bin/cubicweb-ctl.bat	Fri May 07 14:42:18 2010 +0200
+++ b/bin/cubicweb-ctl.bat	Fri May 07 16:50:09 2010 +0200
@@ -8,8 +8,8 @@
 """
 # -------------------- Python section --------------------
 import sys
-from os.path import join, dirname
-sys.path.insert(0, join(dirname(__file__), '..', '..'))
+from os.path import join, dirname, normpath
+sys.path.insert(0, normpath(join(dirname(__file__), '..', '..')))
 from cubicweb.cwctl import run
 run(sys.argv[1:])
 
--- a/dbapi.py	Fri May 07 14:42:18 2010 +0200
+++ b/dbapi.py	Fri May 07 16:50:09 2010 +0200
@@ -553,7 +553,7 @@
         if 'views' in subpath:
             esubpath = list(subpath)
             esubpath.remove('views')
-            esubpath.append('web/views')
+            esubpath.append(join('web', 'views'))
         cubes = reversed([config.cube_dir(p) for p in cubes])
         vpath = config.build_vregistry_path(cubes, evobjpath=esubpath,
                                             tvobjpath=subpath)
--- a/web/webconfig.py	Fri May 07 14:42:18 2010 +0200
+++ b/web/webconfig.py	Fri May 07 16:50:09 2010 +0200
@@ -75,7 +75,7 @@
     """the WebConfiguration is a singleton object handling instance's
     configuration and preferences
     """
-    cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set(['web/views'])
+    cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set([join('web', 'views')])
     cube_appobject_path = CubicWebConfiguration.cube_appobject_path | set(['views'])
 
     options = merge_options(CubicWebConfiguration.options + (