diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-19 11:31:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-19 11:31:24 -0400 |
commit | 49c36b7d10d37ccbc1bfdc78b3abc4b64f9be92f (patch) | |
tree | f9c1bc72837045ae4c68b0e45c1bbcb047bcd421 | |
parent | 8b2c4909d6a64f9aee5b94803805b3b26d4ccd83 (diff) | |
parent | ed3fac3741f01ce05c139216e5af58c238c63f29 (diff) | |
download | external_python_setuptools-49c36b7d10d37ccbc1bfdc78b3abc4b64f9be92f.tar.gz external_python_setuptools-49c36b7d10d37ccbc1bfdc78b3abc4b64f9be92f.tar.bz2 external_python_setuptools-49c36b7d10d37ccbc1bfdc78b3abc4b64f9be92f.zip |
Merge pull request #822 from stepshal/blank
Fix quantity of blank lines.
-rw-r--r-- | setuptools/command/build_py.py | 2 | ||||
-rw-r--r-- | setuptools/msvc.py | 1 | ||||
-rwxr-xr-x | setuptools/sandbox.py | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index b5de9bda..289e6fb8 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -14,8 +14,8 @@ from setuptools.extern.six.moves import map, filter, filterfalse try: from setuptools.lib2to3_ex import Mixin2to3 except ImportError: - class Mixin2to3: + class Mixin2to3: def run_2to3(self, files, doctests=True): "do nothing" diff --git a/setuptools/msvc.py b/setuptools/msvc.py index ef85f64a..447ddb38 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -761,6 +761,7 @@ class EnvironmentInfo: vc_min_ver: float Minimum Microsoft Visual C++ version. """ + # Variables and properties in this class use originals CamelCase variables # names from Microsoft source files for more easy comparaison. diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index 53ce1551..39afd57e 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -290,6 +290,7 @@ class AbstractSandbox: if self._active: src, dst = self._remap_pair(name, src, dst, *args, **kw) return original(src, dst, *args, **kw) + return wrap for name in ["rename", "link", "symlink"]: |