From 7a6ef938cc965f25278ed0c47a65cc7bd914bae4 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Tue, 14 Apr 2020 19:19:09 +0100 Subject: [PATCH] Rename htmlutil.formsearch to htmlutil.loginformsearch Make it clear that this module has only one specific use. --- linkcheck/director/aggregator.py | 4 ++-- .../htmlutil/{formsearch.py => loginformsearch.py} | 0 tests/{test_formsearch.py => test_loginformsearch.py} | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) rename linkcheck/htmlutil/{formsearch.py => loginformsearch.py} (100%) rename tests/{test_formsearch.py => test_loginformsearch.py} (82%) diff --git a/linkcheck/director/aggregator.py b/linkcheck/director/aggregator.py index 2ba8ef12..fdf93427 100644 --- a/linkcheck/director/aggregator.py +++ b/linkcheck/director/aggregator.py @@ -33,7 +33,7 @@ import random from .. import log, LOG_CHECK, strformat, LinkCheckerError from ..decorators import synchronized from ..cache import urlqueue -from ..htmlutil import formsearch +from ..htmlutil import loginformsearch from ..cookies import from_file from . import logger, status, checker, interrupt @@ -90,7 +90,7 @@ class Aggregate (object): response = session.get(url) cgiuser = self.config["loginuserfield"] cgipassword = self.config["loginpasswordfield"] - form = formsearch.search_form(response.text, cgiuser, cgipassword) + form = loginformsearch.search_form(response.text, cgiuser, cgipassword) form.data[cgiuser] = user form.data[cgipassword] = password for key, value in self.config["loginextrafields"].items(): diff --git a/linkcheck/htmlutil/formsearch.py b/linkcheck/htmlutil/loginformsearch.py similarity index 100% rename from linkcheck/htmlutil/formsearch.py rename to linkcheck/htmlutil/loginformsearch.py diff --git a/tests/test_formsearch.py b/tests/test_loginformsearch.py similarity index 82% rename from tests/test_formsearch.py rename to tests/test_loginformsearch.py index c4427337..866e498f 100644 --- a/tests/test_formsearch.py +++ b/tests/test_loginformsearch.py @@ -19,7 +19,7 @@ Test login form functions. import unittest -from linkcheck.htmlutil import formsearch +from linkcheck.htmlutil import loginformsearch login_form = """ @@ -42,14 +42,14 @@ class TestFormSearch(unittest.TestCase): """Test processing of a login form.""" def test_search_form(self): - form = formsearch.search_form(login_form, - "USER_FIELD", "password_field") + form = loginformsearch.search_form(login_form, + "USER_FIELD", "password_field") self.assertIsNotNone(form) self.assertEqual(form.url, "/log_me_in") self.assertIn("User_Field", form.data) self.assertIn("Password_Field", form.data) def test_search_form_none(self): - form = formsearch.search_form(login_form, - "nouser", "nopassword") + form = loginformsearch.search_form(login_form, + "nouser", "nopassword") self.assertIsNone(form)