diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2011-12-14 11:58:20 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2012-01-02 16:08:32 +0100 |
| commit | 4ed0362d41e62d5254be6cfb46e0c0c9fd9de0a0 (patch) | |
| tree | 165cc8959f375b14e3c9ed458c536b98305d6173 /bindings/python/notmuch/database.py | |
| parent | 676ce952d3a5d394d15b11a8292e4a4ac2bdd7c8 (diff) | |
py3k: The ConfigParser module has been renamed to configparser
Diffstat (limited to 'bindings/python/notmuch/database.py')
| -rw-r--r-- | bindings/python/notmuch/database.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py index 7923f76..9318368 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')) |