DomainKey-Signature: a=rsa-sha1; c=nofws; d=SSpaeth.de; h=from:to:cc:subject
	:date:message-id:in-reply-to:references; q=dns; s=sspaeth.de; b=
	K/n2e98f+orXTCp0Kaom7QX5nvYvbgbkexESWwl6P7RTGbkndGhFG2Z+GFRETQtq
	FvvDW6cdFPuZKnyk8MeivPHPpgH4DF4WD1bPNDLWXSCZ8wvqe7njJTeYSKbvvqD3
	e3vISGXiFfgzMEsnygcn7FJL0bNXuCVo04BUzLPDpa0=
From: Sebastian Spaeth <Sebastian@SSpaeth.de>
To: notmuch@notmuchmail.org
Subject: [PATCH] python: Encode query string as a utf-8 byte array
Date: Mon, 11 Jul 2011 11:43:47 +0200
Message-Id: <1310377427-7656-1-git-send-email-Sebastian@SSpaeth.de>
In-Reply-To: <20110707113700.GA16347@megatron>
References: <20110707113700.GA16347@megatron>
Cc: Patrick Totzke <patricktotzke@googlemail.com>
Precedence: list

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>
---
Patrick, can you test, if this fixes the inconsistent behavior in a good way?

 bindings/python/notmuch/database.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py
index 3770b13..859fb18 100644
--- a/bindings/python/notmuch/database.py
+++ b/bindings/python/notmuch/database.py
@@ -501,7 +501,7 @@ class Query(object):
         :param db: An open database which we derive the Query from.
         :type db: :class:`Database`
         :param querystr: The query string for the message.
-        :type querystr: str
+        :type querystr: utf-8 encoded str or unicode
         """
         self._db = None
         self._query = None
@@ -517,7 +517,7 @@ class Query(object):
         :param db: Database to create the query from.
         :type db: :class:`Database`
         :param querystr: The query string
-        :type querystr: str
+        :type querystr: utf-8 encoded str or unicode
         :returns: Nothing
         :exception: :exc:`NotmuchError`
 
@@ -529,7 +529,9 @@ class Query(object):
             raise NotmuchError(STATUS.NOT_INITIALIZED)            
         # create reference to parent db to keep it alive
         self._db = db
-        
+        if is_instance(querystr, unicode):
+            # xapian takes utf-8 encoded byte arrays
+            querystr = querystr.encode('utf-8')
         # create query, return None if too little mem available
         query_p = Query._create(db.db_p, querystr)
         if query_p is None:
-- 
1.7.4.1