Change the import names as renamed

docs/pipext.py

@@ -8,7 +8,7 @@ from docutils import nodes
 from docutils.parsers import rst
 from docutils.statemachine import ViewList
 
-from pip._internal import cmdoptions
+from pip._internal.cli import cmdoptions
 from pip._internal.commands import commands_dict as commands
 
 

src/pip/_internal/cli/autocompletion.py

@@ -5,7 +5,7 @@ import optparse
 import os
 import sys
 
-from pip._internal.cli.baseparser import create_main_parser
+from pip._internal.cli.main_parser import create_main_parser
 from pip._internal.commands import commands_dict, get_summaries
 from pip._internal.utils.misc import get_installed_distributions
 

src/pip/_internal/cli/main_parser.py

@@ -6,7 +6,7 @@ import sys
 
 from pip import __version__
 from pip._internal.cli import cmdoptions
-from pip._internal.cli.base_parser import (
+from pip._internal.cli.parser import (
     ConfigOptionParser, UpdatingDefaultsHelpFormatter,
 )
 from pip._internal.commands import (

tests/lib/options_helpers.py

@@ -3,7 +3,7 @@
 
 import os
 
-from pip._internal import cmdoptions
+from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command
 from pip._internal.commands import commands_dict
 

tests/unit/test_cmdoptions.py

@@ -1,4 +1,5 @@
-from pip._internal import cmdoptions, index
+from pip._internal import index
+from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command