X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=bindings%2Fpython%2Fnotmuch%2F__init__.py;h=cf627ffa288cbf64d13c223d5c5d3bc586838397;hb=0fab493ffe93c2d0dbc274d57e6e932be5c308e5;hp=36e5fc7a0754060a45bbb3bdcfb993dfbea7b4e4;hpb=b6a01735d238733ef78f941a8b7c4bad59db2734;p=notmuch

diff --git a/bindings/python/notmuch/__init__.py b/bindings/python/notmuch/__init__.py
index 36e5fc7a..cf627ffa 100644
--- a/bindings/python/notmuch/__init__.py
+++ b/bindings/python/notmuch/__init__.py
@@ -17,7 +17,7 @@ likely to need.
             db = Database('path',create=True)
             msgs = Query(db,'from:myself').search_messages()
 
-    This returns a :class:`Messages` which internally contains a
+    This returns :class:`Messages` which internally contains a
     reference to its parent :class:`Query` object. Otherwise the
     Query() would be immediately freed, taking our *msgs* down with
     it.
@@ -31,7 +31,6 @@ likely to need.
     Pretty much the same is valid for all other objects in the
     hierarchy, such as :class:`Query`, :class:`Messages`,
     :class:`Message`, and :class:`Tags`.
-
 """
 
 """
@@ -48,16 +47,21 @@ 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 <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010-2011 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
-from notmuch.database import Database, Query
-from notmuch.message import Messages, Message
-from notmuch.thread import Threads, Thread
-from notmuch.tag import Tags
-from notmuch.globals import (
-    nmlib,
+from .database import Database
+from .directory import Directory
+from .filenames import Filenames
+from .message import Message
+from .messages import Messages
+from .query import Query
+from .tag import Tags
+from .thread import Thread
+from .threads import Threads
+from .globals import nmlib
+from .errors import (
     STATUS,
     NotmuchError,
     OutOfMemoryError,
@@ -70,8 +74,11 @@ from notmuch.globals import (
     TagTooLongError,
     UnbalancedFreezeThawError,
     UnbalancedAtomicError,
-    NotInitializedError
+    NotInitializedError,
+    UnsupportedOperationError,
+    UpgradeRequiredError,
+    PathError,
 )
-from notmuch.version import __VERSION__
+from .version import __VERSION__
 __LICENSE__ = "GPL v3+"
 __AUTHOR__ = 'Sebastian Spaeth <Sebastian@SSpaeth.de>'