# HG changeset patch
# User Alexandre Fayolle <alexandre.fayolle@logilab.fr>
# Date 1260958671 -3600
# Node ID 3b442047db3f5c2564b133b9c0c424e331c7b33a
# Parent  2eb47c1efee12bb70bbd61a64cb785895d73678a# Parent  a32b0dc8575c99e7c7955f195900444e0b591585
merge

diff -r 2eb47c1efee1 -r 3b442047db3f etwist/service.py
--- a/etwist/service.py	Wed Dec 16 10:06:00 2009 +0100
+++ b/etwist/service.py	Wed Dec 16 11:17:51 2009 +0100
@@ -41,7 +41,7 @@
     def SvcDoRun(self):
         self.ReportServiceStatus(win32service.SERVICE_START_PENDING)
         logger = getLogger('cubicweb.twisted')
-        logger.info('starting %s service' % instance)
+        logger.info('starting %s service' % self.instance)
         try:
             # create the site
             config = cwcfg.config_for(self.instance)
diff -r 2eb47c1efee1 -r 3b442047db3f server/sources/rql2sql.py
--- a/server/sources/rql2sql.py	Wed Dec 16 10:06:00 2009 +0100
+++ b/server/sources/rql2sql.py	Wed Dec 16 11:17:51 2009 +0100
@@ -995,9 +995,7 @@
             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':
+        if constant.type == 'Substitute':
             _id = constant.value
             if isinstance(_id, unicode):
                 _id = _id.encode()