Merge pull request #195 from jyooru/flake8

flake8

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+ignore = E501,W503
+max-line-length = 88

.github/workflows/main.yaml

@@ -17,9 +17,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
         architecture: x64
     - run: python -m pip install flake8 nox poetry
-    - run: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    - run: flake8 . --count --show-source --statistics
     - run: python -m nox
       env:
         OS: ${{ matrix.os }}
         PYTHON: ${{ matrix.python-version }}
-

pywhat/__init__.py

@@ -7,13 +7,11 @@
 tags = AvailableTags().get_tags()
 pywhat_tags = tags  # left for backward compatibility purposes
 
-_contents = ["Identifier", "Distribution", "tags", "pywhat_tags", "Keys", "Filter"]
+__all__ = ["Identifier", "Distribution", "tags", "pywhat_tags", "Keys", "Filter"]
 
 
-__all__ = _contents
-
 del AvailableTags, filter
 
 
 def __dir__():
-    return _contents + ["__version__"]
+    return __all__ + ["__version__"]

pywhat/filter.py

@@ -91,14 +91,11 @@ def __len__(self):
         return len(self._dict)
 
     def __contains__(self, item):
-        try:
-            return (
-                self["MinRarity"] <= item["Rarity"] <= self["MaxRarity"]
-                and set(item["Tags"]) & self["Tags"]
-                and not set(item["Tags"]) & self["ExcludeTags"]
-            )
-        except:
-            return False
+        return (
+            self["MinRarity"] <= item["Rarity"] <= self["MaxRarity"]
+            and set(item["Tags"]) & self["Tags"]
+            and not set(item["Tags"]) & self["ExcludeTags"]
+        )
 
     def setdefault(self, key, default=None):
         return self._dict.setdefault(key, default)

pywhat/helper.py

@@ -86,9 +86,15 @@ def issubset(self, other):
 
 
 class Keys(Enum):
-    NAME = lambda match: match["Regex Pattern"]["Name"]
-    RARITY = lambda match: match["Regex Pattern"]["Rarity"]
-    MATCHED = lambda match: match["Matched"]
+    def NAME(match):
+        return match["Regex Pattern"]["Name"]
+
+    def RARITY(match):
+        return match["Regex Pattern"]["Rarity"]
+
+    def MATCHED(match):
+        return match["Matched"]
+
     NONE = auto()
 
 

pywhat/what.py

@@ -222,7 +222,7 @@ def main(**kwargs):
 
                     %t - tags (in 'tag1, tag2 ...' format)
 
-                If you want to print '%' or '\' character - escape it: '\%', '\\'.
+                If you want to print '%' or '\\' character - escape it: '\\%', '\\\\'.
 
     Examples:
 

tests/test_filtration.py

@@ -101,7 +101,7 @@ def test_distribution6():
 
 def test_distribution7():
     with pytest.raises(InvalidTag):
-        dist = Distribution({"Tags": "Media", "MinRarity": 0.7})
+        Distribution({"Tags": "Media", "MinRarity": 0.7})
 
 
 def test_filter():

tests/test_identifier.py

@@ -2,7 +2,7 @@
 
 from pywhat import identifier
 from pywhat.filter import Distribution, Filter
-from pywhat.helper import Keys, load_regexes
+from pywhat.helper import Keys
 
 r = identifier.Identifier()
 
@@ -99,7 +99,7 @@ def test_identifier_sorting6():
 
 def test_only_text():
     out = r.identify("fixtures/file")
-    assert None == out["Regexes"]
+    assert out["Regexes"] is None
 
     out = r.identify("THM{7281j}}", only_text=True)
     assert "TryHackMe Flag Format" in out["Regexes"]["text"][0]["Regex Pattern"]["Name"]

tests/test_regex_identifier.py

@@ -1,6 +1,3 @@
-import re
-from typing import List, Tuple
-
 import pytest
 
 from pywhat import regex_identifier