webcode-tk 1.0.6__tar.gz → 1.0.9__tar.gz

{webcode_tk-1.0.6 → webcode_tk-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webcode-tk
-Version: 1.0.6
+Version: 1.0.9
 Summary: 
 Home-page: https://github.com/HundredVisionsGuy/webcode-tk
 License: MIT

{webcode_tk-1.0.6 → webcode_tk-1.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "webcode-tk"
-version = "1.0.6"
+version = "1.0.9"
 description = ""
 authors = ["hundredvisionsguy <cwinikka@gmail.com>"]
 keywords = ["html", "validation", "css", ]

{webcode_tk-1.0.6 → webcode_tk-1.0.9}/webcode_tk/__init__.py

@@ -18,4 +18,4 @@ Modules exported by this package:
 - `validator_tools`: sends HTML or CSS code to the W3C Validator to check
           for errors.
 """
-__version__ = "1.0.6"
+__version__ = "1.0.9"

{webcode_tk-1.0.6 → webcode_tk-1.0.9}/webcode_tk/cascade_tools.py

@@ -1677,7 +1677,7 @@ def get_color_contrast_details(tree: CSSAppliedTree, rating="AAA") -> list:
         results = adjusted
     else:
         # It's a success! Let's let them know
-        msg = f"success: {filename} passes color contrast for {rating} Normal"
+        msg = f"pass: {filename} passes color contrast for {rating} Normal"
         msg += " and Large."
         results.append(msg)
     return results

{webcode_tk-1.0.6 → webcode_tk-1.0.9}/webcode_tk/css_tools.py

@@ -93,6 +93,7 @@ class Stylesheet:
         self.type = stylesheet_type
         self.href = href
         self.text = text
+        self.__clean_text()
         self.nested_at_rules = []
         self.rulesets = []
         self.comments = []
@@ -108,6 +109,30 @@ class Stylesheet:
         self.__extract_rulesets()
         self.__set_selectors()
 
+    def __clean_text(self):
+        """cleans up CSS like removing extra line returns
+
+        This is here because if a student has more than 2 blank lines, it
+        could trigger an attribute error (at least it did in the past)
+        """
+        text_to_clean = self.text
+        split_text = text_to_clean.split("\n")
+        cleaned_text = ""
+        consecutive_blanks = 0
+        for line in split_text:
+            if not line:
+                consecutive_blanks += 1
+            if consecutive_blanks > 1:
+                consecutive_blanks = 1
+                continue
+            else:
+                if not line and cleaned_text:
+                    cleaned_text += "\n"
+                cleaned_text += line + "\n"
+        if cleaned_text[-1:] == "\n":
+            cleaned_text = cleaned_text[:-1].strip()
+        self.text = cleaned_text
+
     def __minify(self):
         """Removes all whitespace, line returns, and tabs from text."""
         self.text = minify_code(self.text)
@@ -1260,9 +1285,10 @@ def get_declaration_value_by_property(
 def get_families(declaration_block: DeclarationBlock) -> list:
     """returns a list of all font families in a declaration block"""
     families = []
-    for ruleset in declaration_block.declarations:
-        if ruleset.property in ("font", "font-family"):
-            families.append(ruleset.value)
+    if declaration_block:
+        for ruleset in declaration_block.declarations:
+            if ruleset.property in ("font", "font-family"):
+                families.append(ruleset.value)
     return families
 
 
@@ -1279,7 +1305,10 @@ def get_font_families(sheet: Stylesheet) -> list:
     """
     font_families = []
     for ruleset in sheet.rulesets:
-        block = ruleset.declaration_block
+        try:
+            block = ruleset.declaration_block
+        except AttributeError:
+            continue
         families = get_families(block)
         if families:
             # create dict of selector and family