# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1236674464 -3600
# Node ID 278f997aa25759899167d63b6586bffd2faedf32
# Parent  15d3e1b3a27de6357eeb4b1d10b991e59918d212
fix sys.path adjustment

diff -r 15d3e1b3a27d -r 278f997aa257 cwconfig.py
--- a/cwconfig.py	Tue Mar 10 09:39:23 2009 +0100
+++ b/cwconfig.py	Tue Mar 10 09:41:04 2009 +0100
@@ -353,8 +353,9 @@
     @classmethod
     def cls_adjust_sys_path(cls):
         """update python path if necessary"""
-        if not cls.CUBES_DIR in sys.path:
-            sys.path.insert(0, cls.CUBES_DIR)
+        cubes_parent_dir = normpath(join(cls.CUBES_DIR, '..'))
+        if not cubes_parent_dir in sys.path:
+            sys.path.insert(0, cubes_parent_dir)
         try:
             import cubes
             cubes.__path__ = cls.cubes_search_path()
diff -r 15d3e1b3a27d -r 278f997aa257 test/unittest_cwconfig.py
--- a/test/unittest_cwconfig.py	Tue Mar 10 09:39:23 2009 +0100
+++ b/test/unittest_cwconfig.py	Tue Mar 10 09:41:04 2009 +0100
@@ -73,6 +73,9 @@
                            'email/entities.py', 'email/views', 'email/hooks.py'])
 
     def test_cubes_path(self):
+        # make sure we don't import the email cube, but the stdlib email package
+        import email
+        self.assertNotEquals(dirname(email.__file__), self.config.CUBES_DIR)
         os.environ['CW_CUBES_PATH'] = join(dirname(__file__), 'data', 'cubes')
         self.assertEquals(self.config.cubes_search_path(),
                           [abspath(join(dirname(__file__), 'data', 'cubes')),