re-common 10.0.36__py3-none-any.whl → 10.0.38__py3-none-any.whl

re_common/v2/baselibrary/utils/stringutils.py

@@ -179,12 +179,24 @@ class HTMLTextExtractor(HTMLParser):
 #     parser.close()
 #     return parser.get_text()
 
+# def clean_html(html):
+#     """使用 Parsel 提取 HTML 中的纯文本"""
+#     sel = Selector(text=html, type='html')
+#     # 提取所有文本（包括子元素的文本）
+#     text = sel.xpath("string()").getall()
+#     return "".join(text).strip()
+
+
 def clean_html(html):
-    """使用 Parsel 提取 HTML 中的纯文本"""
-    sel = Selector(text=html, type='html')
-    # 提取所有文本（包括子元素的文本）
-    text = sel.xpath("string()").getall()
-    return "".join(text).strip()
+    if "<" in html:
+        from bs4 import BeautifulSoup
+        try:
+            soup = BeautifulSoup(html, "lxml")
+            return soup.get_text()
+        except:
+            soup = BeautifulSoup(html, "html5lib")
+            return soup.get_text()
+    return html
 
 
 def remove_spaces_between_chinese_characters(text):

{re_common-10.0.36.dist-info → re_common-10.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: re_common
-Version: 10.0.36
+Version: 10.0.38
 Summary: a library about all python projects
 Home-page: https://gitee.com/xujiangios/re-common
 Author: vic

{re_common-10.0.36.dist-info → re_common-10.0.38.dist-info}/RECORD

@@ -214,7 +214,7 @@ re_common/v2/baselibrary/utils/n_ary_expression_tree.py,sha256=-05kO6G2Rth7CEK-5
 re_common/v2/baselibrary/utils/string_bool.py,sha256=vxnjSFOfuHWGxkqaIbUNn21opx5tfV1uCXSahFfp1mU,6197
 re_common/v2/baselibrary/utils/string_clear.py,sha256=Ympa0Cs2y_72QeeyMS8de8y_QgtEFJJQ0AgHnylbMUc,7861
 re_common/v2/baselibrary/utils/string_smi.py,sha256=cU0WAWHRGnGoVQx3eCEKeM_q_olFNzRTJe7rSe586SY,741
-re_common/v2/baselibrary/utils/stringutils.py,sha256=F1JZ9vfSWM0TEffiNUGVE40yrzXz0fuzrYyys-PgDqw,8144
+re_common/v2/baselibrary/utils/stringutils.py,sha256=uUjcyMEmYIzPUxQ_enpRj_qrvQnYtoL2gEug7WIrIbU,8463
 re_common/vip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 re_common/vip/base_step_process.py,sha256=VXXiNj0I5CpzXIMCgOPU86bzDJkSBkUS-9CpZIl_GOk,205
 re_common/vip/baseencodeid.py,sha256=nERoe89ueFM52bG7xwJdflcZHk6T2RQQKbc5uUZc3RM,3272
@@ -241,8 +241,8 @@ re_common/vip/title/transform/TransformRegulationTitleToZt.py,sha256=LKRdIsWKues
 re_common/vip/title/transform/TransformStandardTitleToZt.py,sha256=-fCKAbSBzXVyQDCE61CalvR9E_QzQMA08QOO_NePFNI,5563
 re_common/vip/title/transform/TransformThesisTitleToZt.py,sha256=QS-uV0cQrpUFAcKucuJQ9Ue2VRQH-inmfn_X3IplfRo,5488
 re_common/vip/title/transform/__init__.py,sha256=m83-CWyRq_VHPYHaALEQlmXrkTdrZ3e4B_kCfBYE-uc,239
-re_common-10.0.36.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-re_common-10.0.36.dist-info/METADATA,sha256=2BGTDBrd17-eWFaKfrQbE9xZdyOe3i-NwME64lIRjvs,582
-re_common-10.0.36.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-re_common-10.0.36.dist-info/top_level.txt,sha256=_H9H23zoLIalm1AIY_KYTVh_H0ZnmjxQIxsvXtLv45o,10
-re_common-10.0.36.dist-info/RECORD,,
+re_common-10.0.38.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+re_common-10.0.38.dist-info/METADATA,sha256=abixIXN2b8yXkvit_fXpJkwJtQGlJXwWuRII7kNYaTM,582
+re_common-10.0.38.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+re_common-10.0.38.dist-info/top_level.txt,sha256=_H9H23zoLIalm1AIY_KYTVh_H0ZnmjxQIxsvXtLv45o,10
+re_common-10.0.38.dist-info/RECORD,,