Do not shlex.split() and flatten value of global|install_options

Author: gvalkov

docs/reference/pip_install.rst

@@ -98,20 +98,27 @@ Some Examples:
 Per-requirement Overrides
 +++++++++++++++++++++++++
 
-It is possible to set ``--install-option`` and ``--global-option``
-for each requirement in the requirements file:
+When pip installs packages, it normally executes the ``setup.py`` file
+behind the scenes. You may extend the arguments with which the
+``setup.py`` file is called through the ``--global-option`` and
+``--install-option`` options. For example:
 
  ::
 
-    FooProject >= 1.2 --install-option="--prefix='/usr/local'" \
-                      --global-option="--no-user-cfg"
+    FooProject >= 1.2 --global-option="--no-user-cfg" \
+                      --install-option="--prefix='/usr/local'" \
+                      --install-option="--no-compile"
 
 The above translates roughly into running FooProject's ``setup.py``
 script as:
 
  ::
 
-    python setup.py --no-user-cfg install --prefix='/usr/local'
+   python setup.py --no-user-cfg install --prefix='/usr/local' --no-compile
+
+Note that the correct way of giving more than one option to
+``setup.py`` is through multiple ``--global-option`` and
+``--install-option`` options, as shown in the example above.
 
 
 .. _`Pre Release Versions`:

pip/req/req_file.py

@@ -243,11 +243,6 @@ def parse_requirement_options(args):
     args = shlex.split(args)
     opts, _ = _req_parser.parse_args(args)
 
-    if opts.install_options:
-        opts.install_options = flat_shlex_split(opts.install_options)
-    if opts.global_options:
-        opts.global_options = flat_shlex_split(opts.global_options)
-
     # Remove None keys from result.
     keys = [opt for opt in opts.__dict__ if getattr(opts, opt) is None]
     for key in keys:
@@ -303,12 +298,4 @@ def partition_line(line):
     return firstword, rest
 
 
-def flat_shlex_split(x):
-    '''
-    >>> flat_shlex_split(['--one --two', '--three "4" --five'])
-    ['--one', '--two', '--three', '4', '--five']
-    '''
-    return [j for i in x for j in shlex.split(i)]
-
-
 __all__ = 'parse_requirements'

tests/functional/test_install_reqs.py

@@ -134,7 +134,7 @@ def getsetuppyargs(contents):
     '''
 
     args = getsetuppyargs(reqfile)
-    expected = set(['--one', '--two', '--three', '--four', '-5', '-6'])
+    expected = set(['--one --two', '--three', '--four -5', '-6'])
     assert expected.issubset(set(args))
 
 

tests/unit/test_req.py

@@ -555,16 +555,22 @@ def test_parse_flags_from_requirements(finder):
 
 def test_get_requirement_options():
     res = parse_requirement_options('--install-option="--abc --zxc"')
-    assert res == {'install_options': ['--abc', '--zxc']}
+    assert res == {'install_options': ['--abc --zxc']}
+
+    res = parse_requirement_options('--global-option "--abc"')
+    assert res == {'global_options': ['--abc']}
 
     line = (
-        'INITools==2.0 --global-option="--one --two -3" '
-        '--install-option="--prefix=/opt"'
+        'INITools==2.0 '
+        '--global-option="--one --two -3" '
+        '--global-option="--four" '
+        '--install-option="--prefix=/opt" '
+        '--install-option="--help" '
     )
     assert parse_line(line) == (REQUIREMENT, (
         'INITools==2.0', {
-            'global_options': ['--one', '--two', '-3'],
-            'install_options': ['--prefix=/opt'],
+            'global_options': ['--one --two -3', '--four'],
+            'install_options': ['--prefix=/opt', '--help'],
         }))
 
 
@@ -588,7 +594,7 @@ def test_install_requirements_with_options(tmpdir, finder, session):
             pass
 
         call = popen.call_args_list[0][0][0]
-        for i in '--one', '--two', '-3', '--prefix=/opt':
+        for i in '--one --two -3', '--prefix=/opt':
             assert i in call
 
     # TODO: assert that --global-option come before --install-option.