Remove old compatibility code

nsist/__init__.py

@@ -24,7 +24,7 @@ from .commands import prepare_bin_directory
 from .copymodules import copy_modules
 from .nsiswriter import NSISFileWriter
 from .wheels import WheelGetter
-from .util import download, text_types, get_cache_dir, normalize_path
+from .util import download, get_cache_dir, normalize_path
 
 __version__ = '2.1'
 
@@ -286,7 +286,7 @@ if __name__ == '__main__':
                                                 + ('' if sc['console'] else 'w')
 
                     specified_preamble = sc.get('extra_preamble', None)
-                    if isinstance(specified_preamble, text_types):
+                    if isinstance(specified_preamble, str):
                         # Filename
                         extra_preamble = io.open(specified_preamble, encoding='utf-8')
                     elif specified_preamble is None:

nsist/commands.py

@@ -2,7 +2,6 @@ import io
 import shutil
 import win_cli_launchers
 
-from .util import text_types
 
 SCRIPT_TEMPLATE = u"""#!python
 import sys, os
@@ -30,7 +29,7 @@ def prepare_bin_directory(target, commands, bitness=32):
         shutil.copy(exe_src, str(target / (name+'.exe')))
 
         specified_preamble = command.get('extra_preamble', None)
-        if isinstance(specified_preamble, text_types):
+        if isinstance(specified_preamble, str):
             # Filename
             extra_preamble = io.open(specified_preamble, encoding='utf-8')
         elif specified_preamble is None:

nsist/util.py

@@ -1,22 +1,11 @@
 import os
-import errno
 import logging
-try:
-    from pathlib import Path
-except ImportError:
-    from pathlib2 import Path  # Backport
+from pathlib import Path
 import requests
 import sys
 
 logger = logging.getLogger(__name__)
 
-PY3 = sys.version_info[0] >= 3
-
-if PY3:
-    text_types = (str,)
-else:
-    text_types = (str, unicode) # analysis:ignore
-
 
 def download(url, target):
     """Download a file using requests.
@@ -56,12 +45,7 @@ def get_cache_dir(ensure_existence=False):
         p = Path(local, 'pynsist')
 
     if ensure_existence:
-        try:
-            p.mkdir(parents=True)
-        except OSError as e:
-            # Py2 compatible equivalent of FileExistsError
-            if e.errno != errno.EEXIST:
-                raise
+        p.mkdir(parents=True, exist_ok=True)
 
     return p