search: deprecate --index in favor of --index-url

Fix pypa#589

Author: xavfernandez

pip/commands/search.py

@@ -3,11 +3,13 @@
 import logging
 import sys
 import textwrap
+import warnings
 
+from pip import cmdoptions
 from pip.basecommand import Command, SUCCESS
 from pip.download import PipXmlrpcTransport
-from pip.index import PyPI
 from pip.utils import get_terminal_size
+from pip.utils.deprecation import RemovedInPip10Warning
 from pip.utils.logging import indent_log
 from pip.exceptions import CommandError
 from pip.status_codes import NO_MATCHES_FOUND
@@ -31,8 +33,8 @@ def __init__(self, *args, **kw):
             '--index',
             dest='index',
             metavar='URL',
-            default=PyPI.pypi_url,
             help='Base URL of Python Package Index (default %default)')
+        self.cmd_opts.add_option(cmdoptions.index_url())
 
         self.parser.insert_option_group(0, self.cmd_opts)
 
@@ -53,7 +55,14 @@ def run(self, options, args):
         return NO_MATCHES_FOUND
 
     def search(self, query, options):
-        index_url = options.index
+        if options.index is not None:
+            warnings.warn(
+                "--index has been deprecated in favor of --index-url.",
+                RemovedInPip10Warning,
+            )
+            index_url = options.index
+        else:
+            index_url = options.index_url
         with self._build_session(options) as session:
             transport = PipXmlrpcTransport(index_url, session)
             pypi = xmlrpc_client.ServerProxy(index_url, transport)