py3k: The ConfigParser module has been renamed to configparser

diff --git a/bindings/python/notmuch.py b/bindings/python/notmuch.py
index 8d1185953b5ccd50c9032b1220624873857701af..3ff53ec8c60ed6459a9eb36b03bf81e246eca838 100755 (executable)
--- a/bindings/python/notmuch.py
+++ b/bindings/python/notmuch.py
@@ -17,7 +17,12 @@ import stat
 import email
 
 from notmuch import Database, Query, NotmuchError, STATUS
-from ConfigParser import SafeConfigParser
+try:
+    # python3.x
+    from configparser import SafeConfigParser
+except ImportError:
+    # python2.x
+    from ConfigParser import SafeConfigParser
 from cStringIO import StringIO
 
 PREFIX = re.compile('(\w+):(.*$)')

diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py
index 7923f768b1f78caec831c3018b5280367feb9712..93183687a4259c8aebe391ccb342c4b577493366 100644 (file)
--- a/bindings/python/notmuch/database.py
+++ b/bindings/python/notmuch/database.py
@@ -543,7 +543,13 @@ class Database(object):
         """ Reads a user's notmuch config and returns his db location
 
         Throws a NotmuchError if it cannot find it"""
-        from ConfigParser import SafeConfigParser
+        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'))