From: David Bremner <bremner@debian.org>
Date: Thu, 24 May 2012 01:48:16 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.14~119
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6d44c5af6568d2a559c163ace14d27cc7e2ba1bc;hp=-c

Merge branch 'release'

merge 0.13.1 bugfix patches back to master, fixes for emacs reply and
spurious directory document creation.
---

6d44c5af6568d2a559c163ace14d27cc7e2ba1bc
diff --combined bindings/python/notmuch/database.py
index ee0366cd,e5c74cfb..5931f41b
--- a/bindings/python/notmuch/database.py
+++ b/bindings/python/notmuch/database.py
@@@ -20,8 -20,7 +20,8 @@@ Copyright 2010 Sebastian Spaeth <Sebast
  import os
  import codecs
  from ctypes import c_char_p, c_void_p, c_uint, byref, POINTER
 -from notmuch.globals import (
 +from .compat import SafeConfigParser
 +from .globals import (
      nmlib,
      Enum,
      _str,
@@@ -38,8 -37,8 +38,8 @@@ from .errors import 
      NotInitializedError,
      ReadOnlyDatabaseError,
  )
 -from notmuch.message import Message
 -from notmuch.tag import Tags
 +from .message import Message
 +from .tag import Tags
  from .query import Query
  from .directory import Directory
  
@@@ -347,7 -346,6 +347,6 @@@ class Database(object)
  
      def get_directory(self, path):
          """Returns a :class:`Directory` of path,
-         (creating it if it does not exist(?))
  
          :param path: An unicode string containing the path relative to the path
                of database (see :meth:`get_path`), or else should be an absolute
@@@ -355,8 -353,6 +354,6 @@@
          :returns: :class:`Directory` or raises an exception.
          :raises: :exc:`FileError` if path is not relative database or absolute
                   with initial components same as database.
-         :raises: :exc:`ReadOnlyDatabaseError` if the database has not been
-                  opened in read-write mode
          """
          self._assert_db_is_initialized()
  
@@@ -530,19 -526,10 +527,10 @@@
                   retry.
          :raises: :exc:`NotInitializedError` if the database was not
                   intitialized.
-         :raises: :exc:`ReadOnlyDatabaseError` if the database has not been
-                  opened in read-write mode
  
          *Added in notmuch 0.9*"""
          self._assert_db_is_initialized()
  
-         # work around libnotmuch calling exit(3), see
-         # id:20120221002921.8534.57091@thinkbox.jade-hamburg.de
-         # TODO: remove once this issue is resolved
-         if self.mode != Database.MODE.READ_WRITE:
-             raise ReadOnlyDatabaseError('The database has to be opened in '
-                                         'read-write mode for get_directory')
- 
          msg_p = NotmuchMessageP()
          status = Database._find_message_by_filename(self._db, _str(filename),
                                                      byref(msg_p))
@@@ -559,7 -546,7 +547,7 @@@
          """
          self._assert_db_is_initialized()
          tags_p = Database._get_all_tags(self._db)
 -        if tags_p == None:
 +        if not tags_p:
              raise NullPointerError()
          return Tags(tags_p, self)
  
@@@ -590,6 -577,13 +578,6 @@@
          """ Reads a user's notmuch config and returns his db location
  
          Throws a NotmuchError if it cannot find it"""
 -        try:
 -            # python3.x
 -            from configparser import SafeConfigParser
 -        except ImportError:
 -            # python2.x
 -            from ConfigParser import SafeConfigParser
 -
          config = SafeConfigParser()
          conf_f = os.getenv('NOTMUCH_CONFIG',
                             os.path.expanduser('~/.notmuch-config'))
@@@ -603,9 -597,7 +591,9 @@@
      def db_p(self):
          """Property returning a pointer to `notmuch_database_t` or `None`
  
 -        This should normally not be needed by a user (and is not yet
 -        guaranteed to remain stable in future versions).
 +        .. deprecated:: 0.14
 +                        If you really need a pointer to the notmuch
 +                        database object use the `_pointer` field. This
 +                        alias will be removed in notmuch 0.15.
          """
          return self._db