From: Sebastian Spaeth <sebastian@sspaeth.de>
Date: Mon, 19 Apr 2010 19:29:40 +0000 (+0200)
Subject: Remove all traces of cnotmuch
X-Git-Tag: 0.3~121^2~3
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2123bdd7fc61ede26a68f6c521fcdc44cb80ab77;ds=sidebyside

Remove all traces of cnotmuch

import cnotmuch.notmuch is dead. Long live import notmuch!
---

diff --git a/notmuch/__init__.py b/notmuch/__init__.py
index 513209d5..56a4f2a4 100644
--- a/notmuch/__init__.py
+++ b/notmuch/__init__.py
@@ -55,7 +55,7 @@ from database import Database, Query
 from message import Messages, Message
 from thread import Threads, Thread
 from tag import Tags
-from cnotmuch.globals import nmlib, STATUS, NotmuchError
+from notmuch.globals import nmlib, STATUS, NotmuchError
 __LICENSE__="GPL v3+"
 __VERSION__='0.2.2'
 __AUTHOR__ ='Sebastian Spaeth <Sebastian@SSpaeth.de>'
diff --git a/notmuch/database.py b/notmuch/database.py
index f02ec408..f141c03e 100644
--- a/notmuch/database.py
+++ b/notmuch/database.py
@@ -19,10 +19,10 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
 
 import os
 from ctypes import c_int, c_char_p, c_void_p, c_uint, c_long, byref
-from cnotmuch.globals import nmlib, STATUS, NotmuchError, Enum
-from cnotmuch.thread import Threads
-from cnotmuch.message import Messages, Message
-from cnotmuch.tag import Tags
+from notmuch.globals import nmlib, STATUS, NotmuchError, Enum
+from notmuch.thread import Threads
+from notmuch.message import Messages, Message
+from notmuch.tag import Tags
 
 class Database(object):
     """Represents a notmuch database (wraps notmuch_database_t)
@@ -769,7 +769,7 @@ class Directory(object):
 
     def __repr__(self):
         """Object representation"""
-        return "<cnotmuch Directory object '%s'>" % self._path
+        return "<notmuch Directory object '%s'>" % self._path
 
     def __del__(self):
         """Close and free the Directory"""
diff --git a/notmuch/message.py b/notmuch/message.py
index f8d7d5ec..613cc4ab 100644
--- a/notmuch/message.py
+++ b/notmuch/message.py
@@ -21,8 +21,8 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
         
 from ctypes import c_char_p, c_void_p, c_long, c_uint
 from datetime import date
-from cnotmuch.globals import nmlib, STATUS, NotmuchError, Enum
-from cnotmuch.tag import Tags
+from notmuch.globals import nmlib, STATUS, NotmuchError, Enum
+from notmuch.tag import Tags
 import sys
 import email
 import types
diff --git a/notmuch/tag.py b/notmuch/tag.py
index c89e4feb..cf1152a1 100644
--- a/notmuch/tag.py
+++ b/notmuch/tag.py
@@ -17,7 +17,7 @@ along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
 """
 from ctypes import c_char_p
-from cnotmuch.globals import nmlib, STATUS, NotmuchError
+from notmuch.globals import nmlib, STATUS, NotmuchError
 
 #------------------------------------------------------------------------------
 class Tags(object):
diff --git a/notmuch/thread.py b/notmuch/thread.py
index 19bef1a9..eebd6cb5 100644
--- a/notmuch/thread.py
+++ b/notmuch/thread.py
@@ -18,9 +18,9 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
 """
 
 from ctypes import c_char_p, c_void_p, c_long
-from cnotmuch.globals import nmlib, STATUS, NotmuchError
-from cnotmuch.message import Messages
-from cnotmuch.tag import Tags
+from notmuch.globals import nmlib, STATUS, NotmuchError
+from notmuch.message import Messages
+from notmuch.tag import Tags
 from datetime import date
 
 #------------------------------------------------------------------------------