diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2020-01-18 08:13:23 -0800 |
|---|---|---|
| committer | Jon Dufresne <jon.dufresne@gmail.com> | 2020-02-16 09:33:32 -0800 |
| commit | b3de7989665740cd4218d7d814e719d90e75de73 (patch) | |
| tree | d805a67fc0f5ff68e26c806191f8d74b88709af3 /pkg_resources | |
| parent | 43edec2506f901ab939390951383025682448edd (diff) | |
| download | python-setuptools-git-b3de7989665740cd4218d7d814e719d90e75de73.tar.gz | |
Remove pkg_resources.py31compat.makedirs() in favor of the stdlib
As setuptools is now python 3.5+, this compatibility shim is no longer
necessary.
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/__init__.py | 3 | ||||
| -rw-r--r-- | pkg_resources/py31compat.py | 23 |
2 files changed, 1 insertions, 25 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 75563f95..149ab6d2 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -76,7 +76,6 @@ try: except ImportError: importlib_machinery = None -from . import py31compat from pkg_resources.extern import appdirs from pkg_resources.extern import packaging __import__('pkg_resources.extern.packaging.version') @@ -3172,7 +3171,7 @@ def _find_adapter(registry, ob): def ensure_directory(path): """Ensure that the parent directory of `path` exists""" dirname = os.path.dirname(path) - py31compat.makedirs(dirname, exist_ok=True) + os.makedirs(dirname, exist_ok=True) def _bypass_ensure_directory(path): diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py deleted file mode 100644 index a381c424..00000000 --- a/pkg_resources/py31compat.py +++ /dev/null @@ -1,23 +0,0 @@ -import os -import errno -import sys - -from .extern import six - - -def _makedirs_31(path, exist_ok=False): - try: - os.makedirs(path) - except OSError as exc: - if not exist_ok or exc.errno != errno.EEXIST: - raise - - -# rely on compatibility behavior until mode considerations -# and exists_ok considerations are disentangled. -# See https://github.com/pypa/setuptools/pull/1083#issuecomment-315168663 -needs_makedirs = ( - six.PY2 or - (3, 4) <= sys.version_info < (3, 4, 1) -) -makedirs = _makedirs_31 if needs_makedirs else os.makedirs |