webcode-tk 1.2.18__py3-none-any.whl → 1.2.19__py3-none-any.whl

webcode_tk/__init__.py

@@ -40,4 +40,4 @@
 - **`validator_tools`**: sends HTML or CSS code to the W3C Validator to check
           for errors.
 """
-__version__ = "1.2.18"
+__version__ = "1.2.19"

webcode_tk/font_tools.py

@@ -404,9 +404,9 @@ def get_google_font_report(project_dir: str, min=1, max=2) -> str:
         # Check to see the linked fonts match required number.
         num_fonts = len(google_fonts_linked)
         if num_fonts < min:
-            data = f"fail: {filename} does not link to min number of Google "
-            data += "fonts."
-            report.append(data)
+            result = f"fail: {filename} does not link to min number of Google "
+            result += "fonts."
+            report.append(result)
             continue
 
         # if we have any google fonts, are they being used?
@@ -425,12 +425,20 @@ def get_google_font_report(project_dir: str, min=1, max=2) -> str:
 
         num_used = len(fonts_used)
         if num_used >= min and num_used <= max:
-            data = f"pass: {filename} uses the correct number of Google fonts"
-            report.append(data)
+            result = (
+                f"pass: {filename} uses the correct number of Google fonts"
+            )
+            report.append(result)
+        elif num_used > max:
+            result = f"fail: {filename} has too many font families - max is "
+            result += f"{max}, and you have {num_used} families."
+            report.append(result)
         else:
-            data = f"fail: {filename} with {num_used} font families does not "
-            data += "have enough applied Google fonts"
-            report.append(data)
+            result = (
+                f"fail: {filename} with {num_used} font families does not "
+            )
+            result += "have enough applied Google fonts"
+            report.append(result)
     return report
 
 
@@ -442,6 +450,7 @@ def extract_families(family_data: list) -> list:
         family = family.strip()
         family = family.replace('"', "")
         family = family.replace("'", "")
+        family = family.replace("&", "")
         families.append(family)
     return families
 
@@ -453,6 +462,7 @@ def get_google_font_data(href: str) -> list:
     for item in font_data:
         family = item.split(":")[0]
         family = family.replace("+", " ")
+        family = family.replace("&", "")
         font_families.append(family)
     return font_families
 

{webcode_tk-1.2.18.dist-info → webcode_tk-1.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webcode-tk
-Version: 1.2.18
+Version: 1.2.19
 Summary: A set of tools for inspecting HTML and CSS code
 License: MIT
 License-File: LICENSE.rst

{webcode_tk-1.2.18.dist-info → webcode_tk-1.2.19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-webcode_tk/__init__.py,sha256=23ZVXqyx5zzH4KzHsOkB4Nc4ee1EH-252M9AMO7z_mc,1759
+webcode_tk/__init__.py,sha256=MZioMDKm73mh0CFf0JdUtNrOb0bBJ2OMgbpUs03rx08,1759
 webcode_tk/_style_inheritance.py,sha256=LtJM2jPPF6kHOs1LKyenSdpZ5cSiDwZ02Y1UAsSJR8o,13778
 webcode_tk/animation_tools.py,sha256=pBRo-30AUxKIi6YLQIyWzGbkkexUhkwGS_IXngWK0qc,12261
 webcode_tk/cascade_tools.py,sha256=nCID-4s8Jwum8eEkLCYxNETGqroz_j3VLdj_Tgi0S0k,75242
@@ -6,13 +6,13 @@ webcode_tk/color_keywords.py,sha256=zBJOQ_AQDHo1Rcgsn1D2P8v1WsHxm5g-ECwgsRTF91A,
 webcode_tk/color_tools.py,sha256=FEbv_1fIw4qqnXvRTPkNtb-3-IhhrQX82jXTmVm7aJY,33430
 webcode_tk/contrast_tools.py,sha256=yhZTjNgOSklMm3aEX-NlI_n1s2m1ir3acNfafoSQA44,47614
 webcode_tk/css_tools.py,sha256=gOwHDnSphQoyW5FQC7Plv6l4hUq72IaPG2hCXBY60eE,110099
-webcode_tk/font_tools.py,sha256=TykTpAObTJRV5f-mO5YOEVI8kFC95gF5iaYkwayhJUQ,14758
+webcode_tk/font_tools.py,sha256=AUIfRn4BkzEak2oik4-xY3FgUZR2oAEJ_thb9sOEqrQ,15127
 webcode_tk/html_tools.py,sha256=LjiVbWVwarOQPWcBb4KTb70dnYxoC3HUGFtjt3LheuE,15706
 webcode_tk/sample_report.json,sha256=2aS7bG-SBb0dd7hUTF4oLx9wRM_Y36cBiTSLvGg8O3U,742
 webcode_tk/utils.py,sha256=u6OzKUzHdpIqJa4nRzmiZWwx2wfZMBaTT60enEhv_7A,457
 webcode_tk/ux_tools.py,sha256=cmmvk8mKc9hnQSk7e7lT1oJd6RVMv0zI560ty4XxH98,17432
 webcode_tk/validator_tools.py,sha256=MnAM76dGJll4zMOAhJU2c8NiQ_tzENx9KYKTClFT4cc,12393
-webcode_tk-1.2.18.dist-info/METADATA,sha256=zYmBx7cQ-2-3U0HEQlYljZKQrFwZWGi7v9i51xIWXjI,1625
-webcode_tk-1.2.18.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
-webcode_tk-1.2.18.dist-info/licenses/LICENSE.rst,sha256=pQATSvV-waHNcl3zpaU8JGEV51KvC33JoSkt9il8Mss,35430
-webcode_tk-1.2.18.dist-info/RECORD,,
+webcode_tk-1.2.19.dist-info/METADATA,sha256=c8VJcjEw0REzOXtjz-8eAuF-suaKzYwh6c2QC42yZRo,1625
+webcode_tk-1.2.19.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
+webcode_tk-1.2.19.dist-info/licenses/LICENSE.rst,sha256=pQATSvV-waHNcl3zpaU8JGEV51KvC33JoSkt9il8Mss,35430
+webcode_tk-1.2.19.dist-info/RECORD,,