diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-02 09:55:33 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-02 09:55:33 -0500 |
commit | b21f02bdaeab48de81c90142b5ff80c900739613 (patch) | |
tree | 3f01b2497dfc0282599defc9d6b811d1f41e452f /setuptools/tests | |
parent | bbb68a8b848f9dbd4d44419fdae93b5e057763e5 (diff) | |
download | external_python_setuptools-b21f02bdaeab48de81c90142b5ff80c900739613.tar.gz external_python_setuptools-b21f02bdaeab48de81c90142b5ff80c900739613.tar.bz2 external_python_setuptools-b21f02bdaeab48de81c90142b5ff80c900739613.zip |
Combine DALS implementations in textwrap module.
Diffstat (limited to 'setuptools/tests')
-rw-r--r-- | setuptools/tests/test_dist_info.py | 5 | ||||
-rw-r--r-- | setuptools/tests/test_easy_install.py | 11 | ||||
-rw-r--r-- | setuptools/tests/test_windows_wrappers.py | 2 |
3 files changed, 6 insertions, 12 deletions
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py index eab17335..6d0ab587 100644 --- a/setuptools/tests/test_dist_info.py +++ b/setuptools/tests/test_dist_info.py @@ -3,15 +3,12 @@ import os import shutil import tempfile -import textwrap import pytest import pkg_resources +from .textwrap import DALS -def DALS(s): - "dedent and left-strip" - return textwrap.dedent(s).lstrip() class TestDistInfo: diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index b3fa9cff..30789e83 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -1,12 +1,13 @@ """Easy install Tests """ +from __future__ import absolute_import + import sys import os import shutil import tempfile import site import contextlib -import textwrap import tarfile import logging import itertools @@ -29,13 +30,7 @@ import pkg_resources from .py26compat import tarfile_open from . import contexts - - -def DALS(input): - """ - Dedent and left-strip - """ - return textwrap.dedent(input).lstrip() +from .textwrap import DALS class FakeDist(object): diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py index b6c1e573..5b14d07b 100644 --- a/setuptools/tests/test_windows_wrappers.py +++ b/setuptools/tests/test_windows_wrappers.py @@ -12,6 +12,8 @@ the script they are to wrap and with the same name as the script they are to wrap. """ +from __future__ import absolute_import + import sys import textwrap import subprocess |