Update imports to collector.py

src/pip/_internal/index/package_finder.py

@@ -38,7 +38,7 @@
  FrozenSet, Iterable, List, Optional, Set, Text, Tuple, Union,
  )
  from pip._vendor.packaging.version import _BaseVersion
- from pip._internal.collector import LinkCollector
+ from pip._internal.index.collector import LinkCollector
  from pip._internal.models.search_scope import SearchScope
  from pip._internal.req import InstallRequirement
  from pip._internal.pep425tags import Pep425Tag

src/pip/_internal/models/link.py

@@ -19,7 +19,7 @@
 
 if MYPY_CHECK_RUNNING:
  from typing import Optional, Text, Tuple, Union
- from pip._internal.collector import HTMLPage
+ from pip._internal.index.collector import HTMLPage
  from pip._internal.utils.hashes import Hashes
 
 

src/pip/_internal/self_outdated_check.py

@@ -14,7 +14,7 @@
 from pip._vendor.packaging import version as packaging_version
 from pip._vendor.six import ensure_binary
 
-from pip._internal.collector import LinkCollector
+from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import PackageFinder
 from pip._internal.models.search_scope import SearchScope
 from pip._internal.models.selection_prefs import SelectionPreferences

tests/unit/test_build_env.py

@@ -22,8 +22,8 @@ def run_with_build_env(script, setup_script_contents,
  import sys
 
  from pip._internal.build_env import BuildEnvironment
- from pip._internal.collector import LinkCollector
  from pip._internal.download import PipSession
+ from pip._internal.index.collector import LinkCollector
  from pip._internal.index.package_finder import PackageFinder
  from pip._internal.models.search_scope import SearchScope
  from pip._internal.models.selection_prefs import (

tests/unit/test_collector.py

@@ -9,7 +9,7 @@
 from pip._vendor import html5lib, requests
 from pip._vendor.six.moves.urllib import request as urllib_request
 
-from pip._internal.collector import (
+from pip._internal.index.collector import (
  HTMLPage,
  _clean_link,
  _determine_base_url,
@@ -334,7 +334,7 @@ def test_get_html_page_invalid_scheme(caplog, url, vcs_scheme):
  assert page is None
  assert caplog.record_tuples == [
  (
- "pip._internal.collector",
+ "pip._internal.index.collector",
  logging.DEBUG,
  "Cannot look at {} URL {}".format(vcs_scheme, url),
  ),
@@ -366,7 +366,8 @@ def test_get_html_page_directory_append_index(tmpdir):
 
  session = mock.Mock(PipSession)
  fake_response = make_fake_html_response(expected_url)
- with mock.patch("pip._internal.collector._get_html_response") as mock_func:
+ mock_func = mock.patch("pip._internal.index.collector._get_html_response")
+ with mock_func:
  mock_func.return_value = fake_response
  actual = _get_html_page(Link(dir_url), session=session)
  assert mock_func.mock_calls == [
@@ -433,7 +434,7 @@ def check_links_include(links, names):
 
 class TestLinkCollector(object):
 
- @patch('pip._internal.collector._get_html_response')
+ @patch('pip._internal.index.collector._get_html_response')
  def test_collect_links(self, mock_get_html_response, caplog, data):
  caplog.set_level(logging.DEBUG)
 

tests/unit/test_finder.py

@@ -62,7 +62,10 @@ def test_no_partial_name_match(data):
 
 def test_tilde():
  """Finder can accept a path with ~ in it and will normalize it."""
- with patch('pip._internal.collector.os.path.exists', return_value=True):
+ patched_exists = patch(
+ 'pip._internal.index.collector.os.path.exists', return_value=True
+ )
+ with patched_exists:
  finder = make_test_finder(find_links=['~/python-pkgs'])
  req = install_req_from_line("gmpy")
  with pytest.raises(DistributionNotFound):

tests/unit/test_index.py

@@ -3,7 +3,7 @@
 import pytest
 from pip._vendor.packaging.specifiers import SpecifierSet
 
-from pip._internal.collector import LinkCollector
+from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import (
  CandidateEvaluator,
  CandidatePreferences,