X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=bindings%2Fpython%2Fnotmuch%2Fmessage.py;h=fc177eb2b1557cb68c7c5c17bcedaf974b563869;hb=87bdfbc91f65cb1031ef0ac8a804759f2061ac10;hp=0cac09c1c133cee415cc62125b8262f6c0182e25;hpb=cd8fe010135c5f3fd5ad3b97a28c786d928c068a;p=notmuch diff --git a/bindings/python/notmuch/message.py b/bindings/python/notmuch/message.py index 0cac09c1..fc177eb2 100644 --- a/bindings/python/notmuch/message.py +++ b/bindings/python/notmuch/message.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 Jesse Rosenthal @@ -41,10 +41,6 @@ from .tag import Tags from .filenames import Filenames import email -try: - import simplejson as json -except ImportError: - import json class Message(Python3StringMixIn): @@ -304,7 +300,7 @@ class Message(Python3StringMixIn): raise NotInitializedError() tags_p = Message._get_tags(self._msg) - if tags_p == None: + if not tags_p: raise NullPointerError() return Tags(tags_p, self) @@ -576,7 +572,7 @@ class Message(Python3StringMixIn): notmuch.STATUS.SUCCESS here. See there for details.""" if not self._msg: raise NotInitializedError() - return Message._tags_to_maildir_flags(self._msg) + return Message._maildir_flags_to_tags(self._msg) def __repr__(self): """Represent a Message() object by str()"""