From: Gaute Hope Date: Wed, 30 Aug 2017 08:16:33 +0000 (+0200) Subject: python: deprecated add_message calls index_file correctly and returns result X-Git-Tag: 0.26_rc0~148 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=227ecf4949280d457ee029b42ee8d459624a2413 python: deprecated add_message calls index_file correctly and returns result The deprecated Database.add_message now calls the new index_file with correct number of arguments (without an extra `self`), and returns the tuple from index_file - as it used to do before. This change also adds a DeprecationWarning to the function. --- diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py index a2c025eb..1279804a 100644 --- a/bindings/python/notmuch/database.py +++ b/bindings/python/notmuch/database.py @@ -19,6 +19,7 @@ Copyright 2010 Sebastian Spaeth import os import codecs +import warnings from ctypes import c_char_p, c_void_p, c_uint, byref, POINTER from .compat import SafeConfigParser from .globals import ( @@ -471,7 +472,10 @@ class Database(object): def add_message(self, filename, sync_maildir_flags=False): """Deprecated alias for :meth:`index_file` """ - self.index_file(self, filename, sync_maildir_flags=sync_maildir_flags) + warnings.warn( + "This function is deprecated and will be removed in the future, use index_file.", DeprecationWarning) + + return self.index_file(filename, sync_maildir_flags=sync_maildir_flags) _remove_message = nmlib.notmuch_database_remove_message _remove_message.argtypes = [NotmuchDatabaseP, c_char_p]