chore: migrating to ruff and updating pre-commit hooks
This commit is contained in:
+44
-25
@@ -11,7 +11,9 @@ from scrapling.core._types import Any, Dict, Iterable, Union
|
||||
# functools.cache is available on Python 3.9+ only so let's keep lru_cache
|
||||
from functools import lru_cache # isort:skip
|
||||
|
||||
html_forbidden = {html.HtmlComment, }
|
||||
html_forbidden = {
|
||||
html.HtmlComment,
|
||||
}
|
||||
|
||||
|
||||
@lru_cache(1, typed=True)
|
||||
@@ -20,12 +22,11 @@ def setup_logger():
|
||||
|
||||
:returns: logging.Logger: Configured logger instance
|
||||
"""
|
||||
logger = logging.getLogger('scrapling')
|
||||
logger = logging.getLogger("scrapling")
|
||||
logger.setLevel(logging.INFO)
|
||||
|
||||
formatter = logging.Formatter(
|
||||
fmt="[%(asctime)s] %(levelname)s: %(message)s",
|
||||
datefmt="%Y-%m-%d %H:%M:%S"
|
||||
fmt="[%(asctime)s] %(levelname)s: %(message)s", datefmt="%Y-%m-%d %H:%M:%S"
|
||||
)
|
||||
|
||||
console_handler = logging.StreamHandler()
|
||||
@@ -58,7 +59,13 @@ def flatten(lst: Iterable):
|
||||
|
||||
def _is_iterable(s: Any):
|
||||
# This will be used only in regex functions to make sure it's iterable but not string/bytes
|
||||
return isinstance(s, (list, tuple,))
|
||||
return isinstance(
|
||||
s,
|
||||
(
|
||||
list,
|
||||
tuple,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
class _StorageTools:
|
||||
@@ -66,31 +73,43 @@ class _StorageTools:
|
||||
def __clean_attributes(element: html.HtmlElement, forbidden: tuple = ()) -> Dict:
|
||||
if not element.attrib:
|
||||
return {}
|
||||
return {k: v.strip() for k, v in element.attrib.items() if v and v.strip() and k not in forbidden}
|
||||
return {
|
||||
k: v.strip()
|
||||
for k, v in element.attrib.items()
|
||||
if v and v.strip() and k not in forbidden
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def element_to_dict(cls, element: html.HtmlElement) -> Dict:
|
||||
parent = element.getparent()
|
||||
result = {
|
||||
'tag': str(element.tag),
|
||||
'attributes': cls.__clean_attributes(element),
|
||||
'text': element.text.strip() if element.text else None,
|
||||
'path': cls._get_element_path(element)
|
||||
"tag": str(element.tag),
|
||||
"attributes": cls.__clean_attributes(element),
|
||||
"text": element.text.strip() if element.text else None,
|
||||
"path": cls._get_element_path(element),
|
||||
}
|
||||
if parent is not None:
|
||||
result.update({
|
||||
'parent_name': parent.tag,
|
||||
'parent_attribs': dict(parent.attrib),
|
||||
'parent_text': parent.text.strip() if parent.text else None
|
||||
})
|
||||
result.update(
|
||||
{
|
||||
"parent_name": parent.tag,
|
||||
"parent_attribs": dict(parent.attrib),
|
||||
"parent_text": parent.text.strip() if parent.text else None,
|
||||
}
|
||||
)
|
||||
|
||||
siblings = [child.tag for child in parent.iterchildren() if child != element]
|
||||
siblings = [
|
||||
child.tag for child in parent.iterchildren() if child != element
|
||||
]
|
||||
if siblings:
|
||||
result.update({'siblings': tuple(siblings)})
|
||||
result.update({"siblings": tuple(siblings)})
|
||||
|
||||
children = [child.tag for child in element.iterchildren() if type(child) not in html_forbidden]
|
||||
children = [
|
||||
child.tag
|
||||
for child in element.iterchildren()
|
||||
if type(child) not in html_forbidden
|
||||
]
|
||||
if children:
|
||||
result.update({'children': tuple(children)})
|
||||
result.update({"children": tuple(children)})
|
||||
|
||||
return result
|
||||
|
||||
@@ -98,9 +117,9 @@ class _StorageTools:
|
||||
def _get_element_path(cls, element: html.HtmlElement):
|
||||
parent = element.getparent()
|
||||
return tuple(
|
||||
(element.tag,) if parent is None else (
|
||||
cls._get_element_path(parent) + (element.tag,)
|
||||
)
|
||||
(element.tag,)
|
||||
if parent is None
|
||||
else (cls._get_element_path(parent) + (element.tag,))
|
||||
)
|
||||
|
||||
|
||||
@@ -117,6 +136,6 @@ class _StorageTools:
|
||||
|
||||
@lru_cache(128, typed=True)
|
||||
def clean_spaces(string):
|
||||
string = string.replace('\t', ' ')
|
||||
string = re.sub('[\n|\r]', '', string)
|
||||
return re.sub(' +', ' ', string)
|
||||
string = string.replace("\t", " ")
|
||||
string = re.sub("[\n|\r]", "", string)
|
||||
return re.sub(" +", " ", string)
|
||||
|
||||
Reference in New Issue
Block a user