Merge pull request #81 from piatrashkakanstantinass/style

Black and isort stuff

noxfile.py

@@ -5,7 +5,6 @@
 import nox
 from nox.sessions import Session
 
-
 package = "hypermodern_python"
 nox.options.sessions = "lint", "tests"
 locations = "src", "tests", "noxfile.py", "docs/conf.py"

pywhat/distribution.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
-from pywhat.helper import AvailableTags, CaseInsensitiveSet, InvalidTag, load_regexes
+from pywhat.helper import (AvailableTags, CaseInsensitiveSet, InvalidTag,
+                           load_regexes)
 
 
 class Distribution:

scripts/get_file_sigs.py

@@ -1,8 +1,8 @@
-import wikitextparser as wtp
-import requests
 import json
 import re
-import json
+
+import requests
+import wikitextparser as wtp
 
 
 def cleanhtml(raw_html):

scripts/get_tlds.py

@@ -1,4 +1,5 @@
 import re
+
 import requests
 
 tlds = requests.get("https://data.iana.org/TLD/tlds-alpha-by-domain.txt")
@@ -11,11 +12,11 @@
 database = re.sub(
     # what you want to replace
     r'("Name": "Uniform Resource Locator \(URL\)",\s*"Regex": ")[^"]+(")',
-
     # what you want to replace it with - need to be double slashes
-    r"\1(?i)^(?:(?:https?|ftp):\/\/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?::[0-9]{1,5})?)([a-z0-9-_\/]?\\\\.?)*$|^(?:(?:https?|ftp):\/\/)?(?:\\\\S+:\\\\S+@)?(?:[a-z0-9-_]?\\\\.?)+?(?:[a-z0-9-_][a-z0-9-_]{0,62})\\\\.(?:" + final_string + r")(?::\\\\d{2,5})?(?:[\/?#]\\\\S*)?$\2",
-
-    database
+    r"\1(?i)^(?:(?:https?|ftp):\/\/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?::[0-9]{1,5})?)([a-z0-9-_\/]?\\\\.?)*$|^(?:(?:https?|ftp):\/\/)?(?:\\\\S+:\\\\S+@)?(?:[a-z0-9-_]?\\\\.?)+?(?:[a-z0-9-_][a-z0-9-_]{0,62})\\\\.(?:"
+    + final_string
+    + r")(?::\\\\d{2,5})?(?:[\/?#]\\\\S*)?$\2",
+    database,
 )
 
 with open("pywhat/Data/regex.json", "w") as file:

tests/test_distribution.py

@@ -1,5 +1,6 @@
 import pytest
-from pywhat import pywhat_tags, Distribution
+
+from pywhat import Distribution, pywhat_tags
 from pywhat.helper import CaseInsensitiveSet, InvalidTag, load_regexes
 
 

tests/test_identifier.py

@@ -60,7 +60,9 @@ def test_identifier_filtration2():
     filter1 = {"ExcludeTags": ["Identifiers"]}
     filter2 = {"Tags": ["Identifiers"], "MinRarity": 0.6}
     r = identifier.Identifier(dist=Distribution(filter1))
-    regexes = r.identify("fixtures/file", only_text=False, dist=Distribution(filter2))["Regexes"]["file"]
+    regexes = r.identify("fixtures/file", only_text=False, dist=Distribution(filter2))[
+        "Regexes"
+    ]["file"]
     for regex in regexes:
         assert "Identifiers" in regex["Regex Pattern"]["Tags"]
         assert regex["Regex Pattern"]["Rarity"] >= 0.6
@@ -136,4 +138,6 @@ def test_recursion():
     out = r.identify("fixtures", only_text=False)
 
     assert re.findall(r"\'(?:\/|\\\\)file\'", str(list(out["Regexes"].keys())))
-    assert re.findall(r"\'(?:\/|\\\\)test(?:\/|\\\\)file\'", str(list(out["Regexes"].keys())))
+    assert re.findall(
+        r"\'(?:\/|\\\\)test(?:\/|\\\\)file\'", str(list(out["Regexes"].keys()))
+    )

tests/test_regex_identifier.py

@@ -1,4 +1,5 @@
 import pytest
+
 from pywhat import regex_identifier
 
 
@@ -105,7 +106,9 @@ def test_ip4():
     assert "[2001:db8::1]:8080" in res[0]["Matched"]
 
 
-@pytest.mark.skip(reason="Fails because not a valid TLD. If presented in punycode, it works.")
+@pytest.mark.skip(
+    reason="Fails because not a valid TLD. If presented in punycode, it works."
+)
 def test_international_url():
     r = regex_identifier.RegexIdentifier()
     res = r.check(["http://папироска.рф"])