Merge f31338773fdc84a984ce1ec31a5d226690e96390 into c7e7e1d884d3bb241ea6448f72a989434c2a35ec

requirements.txt

@@ -9,3 +9,5 @@ pypandoc
 pytest-benchmark
 pytest-docker-pexpect
 twine
+pathlib2
+importlib

thefuck/conf.py

@@ -4,18 +4,13 @@ from warnings import warn
 from six import text_type
 from . import const
 from .system import Path
+import importlib.util
 
-try:
+def load_source(name, pathname, _file=None):
-    import importlib.util
+    module_spec = importlib.util.spec_from_file_location(name, pathname)
-
+    module = importlib.util.module_from_spec(module_spec)
-    def load_source(name, pathname, _file=None):
+    module_spec.loader.exec_module(module)
-        module_spec = importlib.util.spec_from_file_location(name, pathname)
+    return module
-        module = importlib.util.module_from_spec(module_spec)
-        module_spec.loader.exec_module(module)
-        return module
-except ImportError:
-    from imp import load_source
-
 
 class Settings(dict):
     def __getattr__(self, item):

thefuck/system/unix.py

@@ -3,7 +3,7 @@ import sys
 import tty
 import termios
 import colorama
-from distutils.spawn import find_executable
+from shutil import which
 from .. import const
 
 init_output = colorama.init
@@ -38,7 +38,7 @@ def get_key():
 
 
 def open_command(arg):
-    if find_executable('xdg-open'):
+    if which('xdg-open'):
         return 'xdg-open ' + arg
     return 'open ' + arg