From 4b1a9396684d676768d0371f90b45e255a5d4131 Mon Sep 17 00:00:00 2001 From: funilrys Date: Wed, 31 Mar 2021 14:57:56 +0200 Subject: [PATCH] Apply black+isort --- testUpdateHostsFile.py | 20 +++++++++++++++----- updateHostsFile.py | 15 ++++++++++----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/testUpdateHostsFile.py b/testUpdateHostsFile.py index 69597ee48..c78bb8ada 100644 --- a/testUpdateHostsFile.py +++ b/testUpdateHostsFile.py @@ -1646,20 +1646,30 @@ class GetFileByUrl(BaseStdout): self.assertEqual(expected, actual) def test_connect_unknown_domain(self): - test_url = "http://doesnotexist.google.com" # leads to exception: ConnectionError - with mock.patch("requests.get", side_effect=requests.exceptions.ConnectionError): + test_url = ( + "http://doesnotexist.google.com" # leads to exception: ConnectionError + ) + with mock.patch( + "requests.get", side_effect=requests.exceptions.ConnectionError + ): return_value = get_file_by_url(test_url) self.assertIsNone(return_value) printed_output = sys.stdout.getvalue() - self.assertEqual(printed_output, "Error retrieving data from {}\n".format(test_url)) + self.assertEqual( + printed_output, "Error retrieving data from {}\n".format(test_url) + ) def test_invalid_url(self): test_url = "http://fe80::5054:ff:fe5a:fc0" # leads to exception: InvalidURL - with mock.patch("requests.get", side_effect=requests.exceptions.ConnectionError): + with mock.patch( + "requests.get", side_effect=requests.exceptions.ConnectionError + ): return_value = get_file_by_url(test_url) self.assertIsNone(return_value) printed_output = sys.stdout.getvalue() - self.assertEqual(printed_output, "Error retrieving data from {}\n".format(test_url)) + self.assertEqual( + printed_output, "Error retrieving data from {}\n".format(test_url) + ) class TestWriteData(Base): diff --git a/updateHostsFile.py b/updateHostsFile.py index 7301f587a..9c31d760d 100644 --- a/updateHostsFile.py +++ b/updateHostsFile.py @@ -32,8 +32,10 @@ if not PY3: try: import requests except ImportError: - raise ImportError("This project's dependencies have changed. The Requests library (" - "https://requests.readthedocs.io/en/master/) is now required.") + raise ImportError( + "This project's dependencies have changed. The Requests library (" + "https://requests.readthedocs.io/en/master/) is now required." + ) # Syntactic sugar for "sudo" command in UNIX / Linux @@ -986,7 +988,9 @@ def normalize_rule(rule, target_ip, keep_domain_comments): and spacing reformatted. """ - def normalize_response(extracted_hostname: str, extracted_suffix: Optional[str]) -> Tuple[str, str]: + def normalize_response( + extracted_hostname: str, extracted_suffix: Optional[str] + ) -> Tuple[str, str]: """ Normalizes the responses after the provision of the extracted hostname and suffix - if exist. @@ -1342,8 +1346,9 @@ def flush_dns_cache(): ) if os.path.isfile(service_file): - if 0 != subprocess.call([systemctl, "status", service], - stdout=subprocess.DEVNULL): + if 0 != subprocess.call( + [systemctl, "status", service], stdout=subprocess.DEVNULL + ): continue dns_cache_found = True