py3k: The ConfigParser module has been renamed to configparser

[notmuch] / bindings / python / notmuch.py

diff --git a/bindings/python/notmuch.py b/bindings/python/notmuch.py
index 857261295d7aa63219bdefa0b130023fc5c58399..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+):(.*$)')
@@ -486,7 +491,6 @@ def main():
             print "\n".join([t for t in msgs.collect_tags()])
     #-------------------------------------
     elif sys.argv[1] == 'dump':
-        # TODO: implement "dump <filename>"
         if len(sys.argv) == 2:
             f = sys.stdout
         else: