# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1260892893 -3600
# Node ID c309d441c12883acd5133192004860ff89dd43fc
# Parent  3c3d2a102d4c3069119c01d7547e36a524f062bd# Parent  09622a18501c6c6b6c102707c9cecd8c56654eb4
merge

diff -r 3c3d2a102d4c -r c309d441c128 cwconfig.py
--- a/cwconfig.py	Tue Dec 15 17:00:58 2009 +0100
+++ b/cwconfig.py	Tue Dec 15 17:01:33 2009 +0100
@@ -865,12 +865,12 @@
                     self.warning('site_erudi.py is deprecated, should be renamed to site_cubicweb.py')
 
     def _load_site_cubicweb(self, sitefile):
-        context = {'__file__': sitefile}
-        execfile(sitefile, context, context)
+        from logilab.common.modutils import load_module_from_file
+        module = load_module_from_file(sitefile)
         self.info('%s loaded', sitefile)
         # cube specific options
-        if context.get('options'):
-            self.register_options(context['options'])
+        if getattr(module, 'options', None):
+            self.register_options(module.options)
             self.load_defaults()
 
     def load_configuration(self):
diff -r 3c3d2a102d4c -r c309d441c128 server/sources/rql2sql.py
--- a/server/sources/rql2sql.py	Tue Dec 15 17:00:58 2009 +0100
+++ b/server/sources/rql2sql.py	Tue Dec 15 17:01:33 2009 +0100
@@ -995,9 +995,6 @@
             return self.keyword_map[value]()
         if constant.type == 'Boolean':
             value = self.dbms_helper.boolean_value(value)
-        elif constant.type == 'Password' or constant.type == 'Bytes':
-            value = self.dbms_helper.binary_value(value)
-        elif constant.type == 'Substitute':
             _id = constant.value
             if isinstance(_id, unicode):
                 _id = _id.encode()