# HG changeset patch # User Sylvain Thénault # Date 1267008504 -3600 # Node ID 6ea3a3b21c6aa029b7c2b748eec3518a3e367f58 # Parent 082e66184f7123ee2a1668918501fedcbde48185 [goa] we don't use mx anymore diff -r 082e66184f71 -r 6ea3a3b21c6a embedded/README --- a/embedded/README Wed Feb 24 11:21:51 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -This directory contains extra libraries which are needed -to make cubicweb work. - -The mx.DateTime python implementation is directly taken from -the mx.DateTime distribution. The only modification is the -strptime function which has been mocked using the standard -``datetime`` module. (as provided by the python2.5's stdlib) diff -r 082e66184f71 -r 6ea3a3b21c6a goa/goactl.py --- a/goa/goactl.py Wed Feb 24 11:21:51 2010 +0100 +++ b/goa/goactl.py Wed Feb 24 11:48:24 2010 +0100 @@ -31,7 +31,6 @@ (docutils.__path__[0], 'docutils'), (roman.__file__.replace('.pyc', '.py'), 'roman.py'), - (join(CW_SOFTWARE_ROOT, 'embedded', 'mx'), 'mx'), ('/usr/share/fckeditor/', 'fckeditor'), (join(CW_SOFTWARE_ROOT, 'web', 'data'), join('cubes', 'shared', 'data')), diff -r 082e66184f71 -r 6ea3a3b21c6a goa/test/pytestconf.py --- a/goa/test/pytestconf.py Wed Feb 24 11:21:51 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -"""this pytestconf automatically adds the mx's python version in the PYTHONPATH -:license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses -""" -import sys -import os.path as osp - -import cubicweb -# remove 'mx' modules imported by cubicweb -for modname in sys.modules.keys(): - if modname.startswith('mx'): - sys.modules.pop(modname) - -# this is where mx should get imported from -mxpath = osp.abspath(osp.join(osp.dirname(cubicweb.__file__), 'embedded')) -sys.path.insert(1, mxpath) - -# make sure the correct mx is imported -import mx -assert osp.dirname(mx.__file__) == osp.join(mxpath, 'mx'), '%s != %s' % (osp.dirname(mx.__file__), mxpath)