X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fpython%2Fnotmuch%2Fdatabase.py;h=93183687a4259c8aebe391ccb342c4b577493366;hp=7923f768b1f78caec831c3018b5280367feb9712;hb=4ed0362d41e62d5254be6cfb46e0c0c9fd9de0a0;hpb=676ce952d3a5d394d15b11a8292e4a4ac2bdd7c8;ds=sidebyside

diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py
index 7923f768..93183687 100644
--- 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'))