Merge

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? ']'

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

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,