aboutsummaryrefslogtreecommitdiff
path: root/bindings/python/notmuch/__init__.py
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-06 18:10:31 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-06 18:10:31 +0200
commit7192d0221a361d3d9cfd6626058e4a1c86ea7b44 (patch)
tree11d3db0604f47498e16b50ef7f559e138bfe4482 /bindings/python/notmuch/__init__.py
parent6bc2f5a999d9ff77779d98b7cc688a4350ea65d9 (diff)
parent6b820673fc9c2483572af5ec7ea91e4d7d7258c9 (diff)
Merge remote-tracking branch 'origin/master' into vim
Diffstat (limited to 'bindings/python/notmuch/__init__.py')
-rw-r--r--bindings/python/notmuch/__init__.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/bindings/python/notmuch/__init__.py b/bindings/python/notmuch/__init__.py
index f3ff987..5561624 100644
--- a/bindings/python/notmuch/__init__.py
+++ b/bindings/python/notmuch/__init__.py
@@ -51,12 +51,17 @@ along with notmuch. If not, see <http://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,
@@ -71,6 +76,6 @@ from notmuch.globals import (
UnbalancedAtomicError,
NotInitializedError,
)
-from notmuch.version import __VERSION__
+from .version import __VERSION__
__LICENSE__ = "GPL v3+"
__AUTHOR__ = 'Sebastian Spaeth <Sebastian@SSpaeth.de>'