moz-fluent-linter 0.4.6__py3-none-any.whl → 0.4.8__py3-none-any.whl

fluent_linter/__init__.py

@@ -1 +1 @@
-version = "0.4.6"
+version = "0.4.8"

fluent_linter/linter.py

@@ -5,15 +5,19 @@
 # This script is largely based on the Fluent Linter used in mozilla-central
 # https://firefox-source-docs.mozilla.org/code-quality/lint/linters/fluent-lint.html
 
-from fluent.syntax import ast, parse, serializer, visitor
-from html.parser import HTMLParser
 import argparse
 import bisect
 import os
 import re
 import sys
+
+from html.parser import HTMLParser
+
 import yaml
 
+from fluent.syntax import ast, parse, serializer, visitor
+
+
 try:
     from fluent_linter import version
 except Exception:
@@ -160,31 +164,42 @@ class Linter(visitor.Visitor):
                     f" hard-coded brand names ({', '.join(found_brands)})",
                 )
 
-        if self.apostrophe_re.search(cleaned_str):
-            if not self.exclude_message("TE01", message_id):
-                self.add_error(
-                    node,
-                    message_id,
-                    "TE01",
-                    "Strings with apostrophes should use foo\u2019s instead of foo's.",
-                )
-        if self.incorrect_apostrophe_re.search(cleaned_str):
-            if not self.exclude_message("TE02", message_id):
-                self.add_error(
-                    node,
-                    message_id,
-                    "TE02",
-                    "Strings with apostrophes should use foo\u2019s instead of foo\u2018s.",
-                )
-        if self.single_quote_re.search(cleaned_str):
-            if not self.exclude_message("TE03", message_id):
-                self.add_error(
-                    node,
-                    message_id,
-                    "TE03",
-                    "Single-quoted strings should use Unicode \u2018foo\u2019 instead of 'foo'.",
-                )
-        if self.double_quote_re.search(cleaned_str):
+        if (
+            self.config.get("TE01", {}).get("enabled", True)
+            and self.apostrophe_re.search(cleaned_str)
+            and not self.exclude_message("TE01", message_id)
+        ):
+            self.add_error(
+                node,
+                message_id,
+                "TE01",
+                "Strings with apostrophes should use foo\u2019s instead of foo's.",
+            )
+        if (
+            self.config.get("TE02", {}).get("enabled", True)
+            and self.incorrect_apostrophe_re.search(cleaned_str)
+            and not self.exclude_message("TE02", message_id)
+        ):
+            self.add_error(
+                node,
+                message_id,
+                "TE02",
+                "Strings with apostrophes should use foo\u2019s instead of foo\u2018s.",
+            )
+        if (
+            self.config.get("TE03", {}).get("enabled", True)
+            and self.single_quote_re.search(cleaned_str)
+            and not self.exclude_message("TE03", message_id)
+        ):
+            self.add_error(
+                node,
+                message_id,
+                "TE03",
+                "Single-quoted strings should use Unicode \u2018foo\u2019 instead of 'foo'.",
+            )
+        if self.config.get("TE04", {}).get(
+            "enabled", True
+        ) and self.double_quote_re.search(cleaned_str):
             # Ignore parameterized terms and other functions
             for regex in self.ftl_syntax_re:
                 cleaned_str = regex.sub("", cleaned_str)
@@ -198,15 +213,18 @@ class Linter(visitor.Visitor):
                     "TE04",
                     'Double-quoted strings should use Unicode \u201cfoo\u201d instead of "foo".',
                 )
-        if self.ellipsis_re.search(cleaned_str):
-            if not self.exclude_message("TE05", message_id):
-                self.add_error(
-                    node,
-                    message_id,
-                    "TE05",
-                    "Strings with an ellipsis should use the Unicode \u2026 character"
-                    " instead of three periods",
-                )
+        if (
+            self.config.get("TE05", {}).get("enabled", True)
+            and self.ellipsis_re.search(cleaned_str)
+            and not self.exclude_message("TE05", message_id)
+        ):
+            self.add_error(
+                node,
+                message_id,
+                "TE05",
+                "Strings with an ellipsis should use the Unicode \u2026 character"
+                " instead of three periods",
+            )
 
     def generic_visit(self, node):
         node_name = type(node).__name__
@@ -418,9 +436,9 @@ class Linter(visitor.Visitor):
             and not self.config["PS01"]["disabled"]
             and type(node.expression) not in [ast.SelectExpression]
         ):
-            if type(node.expression) == ast.VariableReference:
+            if isinstance(node.expression, ast.VariableReference):
                 placeable_name = f"${node.expression.id.name}"
-            elif type(node.expression) == ast.TermReference:
+            elif isinstance(node.expression, ast.TermReference):
                 placeable_name = f"-{node.expression.id.name}"
             else:
                 placeable_name = node.expression.id.name
@@ -455,7 +473,7 @@ class Linter(visitor.Visitor):
         # Store the variable used for the SelectExpression, excluding functions
         # like PLATFORM()
         if (
-            type(node.selector) == ast.VariableReference
+            isinstance(node.selector, ast.VariableReference)
             and node.selector.id.name not in self.state["variables"]
         ):
             self.state["variables"].append(node.selector.id.name)

{moz_fluent_linter-0.4.6.dist-info → moz_fluent_linter-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: moz-fluent-linter
-Version: 0.4.6
+Version: 0.4.8
 Summary: Linter package used to check Fluent files
 Home-page: https://github.com/mozilla-l10n/moz-fluent-linter
 Author: Francesco Lodolo
@@ -15,9 +15,10 @@ Classifier: Topic :: Software Development :: Localization
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fluent.syntax <0.19,>=0.18.0
+Requires-Dist: fluent.syntax~=0.19.0
 Requires-Dist: pyyaml
 Requires-Dist: six
+Dynamic: license-file
 
 # Fluent Linter
 
@@ -41,7 +42,7 @@ Using [pre-commit](https://pre-commit.com/), add this to the `.pre-commit-config
 ```yaml
 repos:
   - repo: https://github.com/mozilla-l10n/moz-fluent-linter
-    rev: v0.4.6
+    rev: v0.4.8
     hooks:
       - id: fluent_linter
         files: \.ftl$

moz_fluent_linter-0.4.8.dist-info/RECORD

@@ -0,0 +1,8 @@
+fluent_linter/__init__.py,sha256=U86LejrmMsdC6N-YT7_w8TPLE0rJkGNw9YkhBt378b8,18
+fluent_linter/linter.py,sha256=onOdmqgbj2f9yCHWFHDtT30SK8VJWwG4bv40qYrCv2I,25551
+moz_fluent_linter-0.4.8.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+moz_fluent_linter-0.4.8.dist-info/METADATA,sha256=SjtC23VlGZZ5BTT3ajsYZ2zFxHjbhCoSwVt-ovSaIpU,2134
+moz_fluent_linter-0.4.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moz_fluent_linter-0.4.8.dist-info/entry_points.txt,sha256=-7bz7GIrEJyjG8EUMDKgS6FudRSpGZ9kf7jKQCp1MEg,62
+moz_fluent_linter-0.4.8.dist-info/top_level.txt,sha256=UZi4ExOI1JTsfp5RPbNYAvFFLLZdzKnzPaCbcaEK_d0,14
+moz_fluent_linter-0.4.8.dist-info/RECORD,,

{moz_fluent_linter-0.4.6.dist-info → moz_fluent_linter-0.4.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

moz_fluent_linter-0.4.6.dist-info/RECORD

@@ -1,8 +0,0 @@
-fluent_linter/__init__.py,sha256=DWNNbWBv-hyqVy76bKbnHWaDUbqL0BOtdkPSV_88dx0,18
-fluent_linter/linter.py,sha256=d6s8I4PWIeIOgu-WwfvB2wHDLF0WKm3lOMszerdfqf8,25204
-moz_fluent_linter-0.4.6.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-moz_fluent_linter-0.4.6.dist-info/METADATA,sha256=q44LxVa65ySt0SHSkFyTGu7y6CsuywDkCR9HMP9-qwg,2119
-moz_fluent_linter-0.4.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-moz_fluent_linter-0.4.6.dist-info/entry_points.txt,sha256=-7bz7GIrEJyjG8EUMDKgS6FudRSpGZ9kf7jKQCp1MEg,62
-moz_fluent_linter-0.4.6.dist-info/top_level.txt,sha256=UZi4ExOI1JTsfp5RPbNYAvFFLLZdzKnzPaCbcaEK_d0,14
-moz_fluent_linter-0.4.6.dist-info/RECORD,,