diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-11-27 23:03:03 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-11-27 23:03:03 -0500 |
| commit | 95eed6e888743faaff87f0ffe3c0de5c1dcaaab9 (patch) | |
| tree | fc3906029d620d77327fd1e4b94f8ffd14bec576 | |
| parent | 1a5cecf5cf61861816a2e02e513256b614b492d8 (diff) | |
| parent | 111a8d26aadb31496596320cf35ef4f648f7b62b (diff) | |
| download | python-setuptools-git-95eed6e888743faaff87f0ffe3c0de5c1dcaaab9.tar.gz | |
Merge
| -rw-r--r-- | docs/pkg_resources.txt | 2 | ||||
| -rw-r--r-- | ez_setup.py | 2 | ||||
| -rw-r--r-- | setuptools/command/install_lib.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt index 6c6405a8..3d40a1a2 100644 --- a/docs/pkg_resources.txt +++ b/docs/pkg_resources.txt @@ -592,7 +592,7 @@ Requirements Parsing The syntax of a requirement specifier can be defined in EBNF as follows:: - requirement ::= project_name versionspec? extras? + requirement ::= project_name extras? versionspec? versionspec ::= comparison version (',' comparison version)* comparison ::= '<' | '<=' | '!=' | '==' | '>=' | '>' | '~=' | '===' extras ::= '[' extralist? ']' diff --git a/ez_setup.py b/ez_setup.py index 4740248f..2f5e4856 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -125,7 +125,7 @@ def _do_download(version, download_base, to_dir, download_delay): # Remove previously-imported pkg_resources if present (see # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details). if 'pkg_resources' in sys.modules: - del sys.modules['pkg_resources'] + _unload_pkg_resources() import setuptools setuptools.bootstrap_install_from = egg diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py index 9b772227..78fe6891 100644 --- a/setuptools/command/install_lib.py +++ b/setuptools/command/install_lib.py @@ -79,6 +79,8 @@ class install_lib(orig.install_lib): base = os.path.join('__pycache__', '__init__.' + imp.get_tag()) yield base + '.pyc' yield base + '.pyo' + yield base + '.opt-1.pyc' + yield base + '.opt-2.pyc' def copy_tree( self, infile, outfile, |