Merge branch 'py3k'

2 files changed, 2 insertions, 2 deletions

diff --git a/alot/utils/argparse.py b/alot/utils/argparse.py
index ff19030c..9822882d 100644
--- a/alot/utils/argparse.py
+++ b/alot/utils/argparse.py
@@ -52,7 +52,7 @@ def _path_factory(check):
 
     @functools.wraps(check)
     def validator(paths):
-        if isinstance(paths, basestring):
+        if isinstance(paths, str):
             check(paths)
         elif isinstance(paths, collections.Sequence):
             for path in paths:
diff --git a/alot/utils/configobj.py b/alot/utils/configobj.py
index fa9de2ce..78201690 100644
--- a/alot/utils/configobj.py
+++ b/alot/utils/configobj.py
@@ -5,7 +5,7 @@ from __future__ import absolute_import
 
 import mailbox
 import re
-from urlparse import urlparse
+from urllib.parse import urlparse
 
 from validate import VdtTypeError
 from validate import is_list