debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 19:08:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

python: Encode query string as a utf-8 byte array

Browse source 
If we pass in an unicode instance as query string, we would probably get
weird behavior (and indeed do so, see mail
id:"20110707113700.GA16347@megatron"). If a unicode instance is passed
in, make sure we encode it properly to an utf-8 encoded byte string.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2011-07-11 11:39:42 +02:00
parent 22472d9def
commit 504b6242d1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bindings/python/notmuch/database.py
View file

@ -501,7 +501,7 @@ class Query(object):
:param db: An open database which we derive the Query from. :param db: An open database which we derive the Query from.
:type db: :class:`Database` :type db: :class:`Database`
:param querystr: The query string for the message. :param querystr: The query string for the message.
:type querystr: str :type querystr: utf-8 encoded str or unicode
""" """
self._db = None self._db = None
self._query = None self._query = None
@ -517,7 +517,7 @@ class Query(object):
:param db: Database to create the query from. :param db: Database to create the query from.
:type db: :class:`Database` :type db: :class:`Database`
:param querystr: The query string :param querystr: The query string
:type querystr: str :type querystr: utf-8 encoded str or unicode
:returns: Nothing :returns: Nothing
:exception: :exc:`NotmuchError` :exception: :exc:`NotmuchError`
@ -529,7 +529,9 @@ class Query(object):
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
# create reference to parent db to keep it alive # create reference to parent db to keep it alive
self._db = db self._db = db
if isinstance(querystr, unicode):
# xapian takes utf-8 encoded byte arrays
querystr = querystr.encode('utf-8')
# create query, return None if too little mem available # create query, return None if too little mem available
query_p = Query._create(db.db_p, querystr) query_p = Query._create(db.db_p, querystr)
if query_p is None: if query_p is None: