X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fpython%2Fnotmuch%2Fquery.py;h=cc70e2aa3acc937fcc43d6a577a86337305f8b90;hp=4327007223dcb0d5b52a317760bc988401e32244;hb=60ddce8a161772583e8d223498997ee866d04ede;hpb=e2ecf2b0ebd41257eb82dc1c1ff6d0d970209356
diff --git a/bindings/python/notmuch/query.py b/bindings/python/notmuch/query.py
index 43270072..cc70e2aa 100644
--- a/bindings/python/notmuch/query.py
+++ b/bindings/python/notmuch/query.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with notmuch. If not, see .
+along with notmuch. If not, see .
Copyright 2010 Sebastian Spaeth
"""
@@ -108,7 +108,7 @@ class Query(object):
_set_sort = nmlib.notmuch_query_set_sort
_set_sort.argtypes = [NotmuchQueryP, c_uint]
- _set_sort.argtypes = None
+ _set_sort.restype = None
def set_sort(self, sort):
"""Set the sort order future results will be delivered in
@@ -121,7 +121,7 @@ class Query(object):
_exclude_tag = nmlib.notmuch_query_add_tag_exclude
_exclude_tag.argtypes = [NotmuchQueryP, c_char_p]
- _exclude_tag.resttype = None
+ _exclude_tag.restype = None
def exclude_tag(self, tagname):
"""Add a tag that will be excluded from the query results by default.
@@ -134,10 +134,10 @@ class Query(object):
self._assert_query_is_initialized()
self._exclude_tag(self._query, _str(tagname))
- """notmuch_query_search_threads_st"""
- _search_threads_st = nmlib.notmuch_query_search_threads_st
- _search_threads_st.argtypes = [NotmuchQueryP, POINTER(NotmuchThreadsP)]
- _search_threads_st.restype = c_uint
+ """notmuch_query_search_threads"""
+ _search_threads = nmlib.notmuch_query_search_threads
+ _search_threads.argtypes = [NotmuchQueryP, POINTER(NotmuchThreadsP)]
+ _search_threads.restype = c_uint
def search_threads(self):
"""Execute a query for threads
@@ -155,7 +155,7 @@ class Query(object):
"""
self._assert_query_is_initialized()
threads_p = NotmuchThreadsP() # == NULL
- status = Query._search_threads_st(self._query, byref(threads_p))
+ status = Query._search_threads(self._query, byref(threads_p))
if status != 0:
raise NotmuchError(status)
@@ -164,9 +164,9 @@ class Query(object):
return Threads(threads_p, self)
"""notmuch_query_search_messages_st"""
- _search_messages_st = nmlib.notmuch_query_search_messages_st
- _search_messages_st.argtypes = [NotmuchQueryP, POINTER(NotmuchMessagesP)]
- _search_messages_st.restype = c_uint
+ _search_messages = nmlib.notmuch_query_search_messages
+ _search_messages.argtypes = [NotmuchQueryP, POINTER(NotmuchMessagesP)]
+ _search_messages.restype = c_uint
def search_messages(self):
"""Filter messages according to the query and return
@@ -177,7 +177,7 @@ class Query(object):
"""
self._assert_query_is_initialized()
msgs_p = NotmuchMessagesP() # == NULL
- status = Query._search_messages_st(self._query, byref(msgs_p))
+ status = Query._search_messages(self._query, byref(msgs_p))
if status != 0:
raise NotmuchError(status)
@@ -185,7 +185,7 @@ class Query(object):
raise NullPointerError
return Messages(msgs_p, self)
- _count_messages = nmlib.notmuch_query_count_messages_st
+ _count_messages = nmlib.notmuch_query_count_messages
_count_messages.argtypes = [NotmuchQueryP, POINTER(c_uint)]
_count_messages.restype = c_uint
@@ -204,7 +204,7 @@ class Query(object):
raise NotmuchError(status)
return count.value
- _count_threads = nmlib.notmuch_query_count_threads_st
+ _count_threads = nmlib.notmuch_query_count_threads
_count_threads.argtypes = [NotmuchQueryP, POINTER(c_uint)]
_count_threads.restype = c_uint