# HG changeset patch # User Sylvain Thénault # Date 1277134215 -7200 # Node ID 656c974961c479068a3a62f4387abb5a4be0e290 # Parent b176ac0e3aaa3f029f6ba8d72f0f5a582c76e1ff [rql2sql] #1089207: do not encode Unicode strings from RQL statements to db encoding diff -r b176ac0e3aaa -r 656c974961c4 server/sources/__init__.py --- a/server/sources/__init__.py Mon Jun 21 17:10:25 2010 +0200 +++ b/server/sources/__init__.py Mon Jun 21 17:30:15 2010 +0200 @@ -15,9 +15,8 @@ # # You should have received a copy of the GNU Lesser General Public License along # with CubicWeb. If not, see . -"""cubicweb server sources support +"""cubicweb server sources support""" -""" __docformat__ = "restructuredtext en" from os.path import join, splitext diff -r b176ac0e3aaa -r 656c974961c4 server/sources/rql2sql.py --- a/server/sources/rql2sql.py Mon Jun 21 17:10:25 2010 +0200 +++ b/server/sources/rql2sql.py Mon Jun 21 17:30:15 2010 +0200 @@ -1146,8 +1146,6 @@ _id = _id.encode() else: _id = str(id(constant)).replace('-', '', 1) - if isinstance(value, unicode): - value = value.encode(self.dbencoding) self._query_attrs[_id] = value return '%%(%s)s' % _id diff -r b176ac0e3aaa -r 656c974961c4 server/ssplanner.py --- a/server/ssplanner.py Mon Jun 21 17:10:25 2010 +0200 +++ b/server/ssplanner.py Mon Jun 21 17:30:15 2010 +0200 @@ -15,9 +15,8 @@ # # You should have received a copy of the GNU Lesser General Public License along # with CubicWeb. If not, see . -"""plan execution of rql queries on a single source +"""plan execution of rql queries on a single source""" -""" from __future__ import with_statement __docformat__ = "restructuredtext en"