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 513209d5eb74a45941007ef1a09231d77e6d94b0..56a4f2a4ef143fc0f7db473282bf027299cce50e 100644 (file)
--- 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 f02ec408403d4258a33fb89c9378601c5018a1ca..f141c03ef462b813be27ca58a0a8a323a1e9810c 100644 (file)
--- 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 f8d7d5ec3e7aa75e665ab95fca0fab6b49913744..613cc4abc2be7f89c1501cbabaf008288e50204e 100644 (file)
--- 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 c89e4feba2647a71d859eab4d3bfcd85b23b6649..cf1152a1e5747bc46ed0c3089fb6d60f1f973da4 100644 (file)
--- 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 19bef1a9c85e9efaa86706ad079c47a47c2fb8cf..eebd6cb54724af831ccb963116e4c0c0cf18cde7 100644 (file)
--- 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
 
 #------------------------------------------------------------------------------