diff options
author | stepshal <nessento@openmailbox.org> | 2016-10-18 20:24:35 +0700 |
---|---|---|
committer | stepshal <nessento@openmailbox.org> | 2016-10-18 20:29:34 +0700 |
commit | 31bd37c6ac8de9e8c1bacebc2d8e1215df91eb96 (patch) | |
tree | 3a25ce5765a8c9ae633a3eaeec1ce88f7b382e21 /setuptools/command | |
parent | f774a0be095c3873c2881d393605fefa5ca0d0d6 (diff) | |
download | external_python_setuptools-31bd37c6ac8de9e8c1bacebc2d8e1215df91eb96.tar.gz external_python_setuptools-31bd37c6ac8de9e8c1bacebc2d8e1215df91eb96.tar.bz2 external_python_setuptools-31bd37c6ac8de9e8c1bacebc2d8e1215df91eb96.zip |
Fix quantity of blank lines.
Diffstat (limited to 'setuptools/command')
-rw-r--r-- | setuptools/command/__init__.py | 1 | ||||
-rw-r--r-- | setuptools/command/bdist_egg.py | 2 | ||||
-rwxr-xr-x | setuptools/command/bdist_wininst.py | 1 | ||||
-rw-r--r-- | setuptools/command/build_ext.py | 2 | ||||
-rwxr-xr-x | setuptools/command/easy_install.py | 7 | ||||
-rwxr-xr-x | setuptools/command/sdist.py | 2 | ||||
-rwxr-xr-x | setuptools/command/setopt.py | 1 | ||||
-rw-r--r-- | setuptools/command/test.py | 2 |
8 files changed, 6 insertions, 12 deletions
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py index 3fb2f6df..efbe9411 100644 --- a/setuptools/command/__init__.py +++ b/setuptools/command/__init__.py @@ -10,7 +10,6 @@ import sys from setuptools.command import install_scripts - if 'egg' not in bdist.format_commands: bdist.format_command['egg'] = ('bdist_egg', "Python .egg file") bdist.format_commands.append('egg') diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index cbea7537..8cd9dfef 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -429,10 +429,10 @@ def can_scan(): log.warn("Please ask the author to include a 'zip_safe'" " setting (either True or False) in the package's setup.py") + # Attribute names of options for commands that might need to be convinced to # install to the egg build directory - INSTALL_DIRECTORY_ATTRS = [ 'install_lib', 'install_dir', 'install_data', 'install_base' ] diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py index 8243c917..073de97b 100755 --- a/setuptools/command/bdist_wininst.py +++ b/setuptools/command/bdist_wininst.py @@ -2,7 +2,6 @@ import distutils.command.bdist_wininst as orig class bdist_wininst(orig.bdist_wininst): - def reinitialize_command(self, command, reinit_subcommands=0): """ Supplement reinitialize_command to work around diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py index 454c91fb..12dc88cd 100644 --- a/setuptools/command/build_ext.py +++ b/setuptools/command/build_ext.py @@ -56,7 +56,6 @@ elif os.name != 'nt': except ImportError: pass - if_dl = lambda s: s if have_rtld else '' @@ -70,7 +69,6 @@ def get_abi3_suffix(): class build_ext(_build_ext): - def run(self): """Build extensions in build directory, then copy if --inplace""" old_inplace, self.inplace = self.inplace, 0 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index a3792ce2..03dd6768 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1,5 +1,4 @@ #!/usr/bin/env python - """ Easy Install ------------ @@ -64,7 +63,6 @@ import pkg_resources # Turn on PEP440Warnings warnings.filterwarnings("default", category=pkg_resources.PEP440Warning) - __all__ = [ 'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg', 'main', 'get_exe_prefixes', @@ -92,6 +90,7 @@ def samefile(p1, p2): if six.PY2: + def _to_ascii(s): return s @@ -102,6 +101,7 @@ if six.PY2: except UnicodeError: return False else: + def _to_ascii(s): return s.encode('ascii') @@ -1632,7 +1632,6 @@ class PthDistributions(Environment): class RewritePthDistributions(PthDistributions): - @classmethod def _wrap_lines(cls, lines): yield cls.prelude @@ -1837,6 +1836,7 @@ if '__pypy__' in sys.builtin_module_names: _replace_zip_directory_cache_data = \ _remove_and_clear_zip_directory_cache_data else: + def _replace_zip_directory_cache_data(normalized_path): def replace_cached_zip_archive_directory_data(path, old_entry): # N.B. In theory, we could load the zip directory information just @@ -2164,7 +2164,6 @@ class WindowsScriptWriter(ScriptWriter): class WindowsExecutableLauncherWriter(WindowsScriptWriter): - @classmethod def _get_script_args(cls, type_, name, header, script_text): """ diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index b85d7d03..9975753d 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -89,8 +89,10 @@ class sdist(sdist_add_defaults, orig.sdist): """ In a context, remove and restore os.link if it exists """ + class NoValue: pass + orig_val = getattr(os, 'link', NoValue) try: del os.link diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py index 7f332be5..7e57cc02 100755 --- a/setuptools/command/setopt.py +++ b/setuptools/command/setopt.py @@ -8,7 +8,6 @@ from setuptools.extern.six.moves import configparser from setuptools import Command - __all__ = ['config_file', 'edit_config', 'option_base', 'setopt'] diff --git a/setuptools/command/test.py b/setuptools/command/test.py index 38bbcd8b..270674e2 100644 --- a/setuptools/command/test.py +++ b/setuptools/command/test.py @@ -17,7 +17,6 @@ from setuptools.py31compat import unittest_main class ScanningLoader(TestLoader): - def loadTestsFromModule(self, module, pattern=None): """Return a suite of all tests cases contained in the given module @@ -50,7 +49,6 @@ class ScanningLoader(TestLoader): # adapted from jaraco.classes.properties:NonDataProperty class NonDataProperty(object): - def __init__(self, fget): self.fget = fget |