maco 1.2.9__py3-none-any.whl → 1.2.10__py3-none-any.whl

maco/utils.py

@@ -39,8 +39,8 @@ logger = logging.getLogger("maco.lib.utils")
 
 VENV_DIRECTORY_NAME = ".venv"
 
-RELATIVE_FROM_RE = re.compile(r"from (\.+)")
-RELATIVE_FROM_IMPORT_RE = re.compile(r"from (\.+) import")
+RELATIVE_FROM_RE = re.compile(rb"from (\.+)")
+RELATIVE_FROM_IMPORT_RE = re.compile(rb"from (\.+) import")
 
 UV_BIN = find_uv_bin()
 
@@ -171,19 +171,19 @@ def scan_for_extractors(root_directory: str, scanner: yara.Rules, logger: Logger
                 # Scan Python file for potential extractors
                 if package:
                     # Inspect the contents and look for any relative import issues
-                    with open(path, "r") as f:
+                    with open(path, "rb") as f:
                         data = f.read()
 
-                    with open(path, "w") as f:
+                    with open(path, "wb") as f:
                         # Replace any relative importing with absolute
                         curr_dir = os.path.dirname(path)
                         split = curr_dir.split("/")[::-1]
                         for pattern in [RELATIVE_FROM_IMPORT_RE, RELATIVE_FROM_RE]:
                             for match in pattern.findall(data):
-                                depth = match.count(".")
+                                depth = match.count(b".")
                                 abspath = ".".join(split[depth - 1 : split.index(package) + 1][::-1])
                                 abspath += "." if pattern == RELATIVE_FROM_RE else ""
-                                data = data.replace(f"from {match}", f"from {abspath}", 1)
+                                data = data.replace(f"from {match.decode()}".encode(), f"from {abspath}".encode(), 1)
                         f.write(data)
 
                 if scanner.match(path):

{maco-1.2.9.dist-info → maco-1.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: maco
-Version: 1.2.9
+Version: 1.2.10
 Author: sl-govau
 Maintainer: cccs-rs
 License: MIT License

{maco-1.2.9.dist-info → maco-1.2.10.dist-info}/RECORD

@@ -12,7 +12,7 @@ maco/base_test.py,sha256=cjGLEy2c69wl9sjn74QFz7X-VxWOfdin4W8MvYsXc4Q,2718
 maco/cli.py,sha256=pPS8euWaLV-6csBCCzT1Mtc7GwP7a_RikDjfUYxoxU8,8415
 maco/collector.py,sha256=cBZEHx5qjFwf-EfAgEmXlu4kT4rWZkcDE926gBrOoN8,7493
 maco/extractor.py,sha256=uGSGiCQ4jd8jFmfw2T99BGcY5iQJzXHcG_RoTIxClTE,2802
-maco/utils.py,sha256=-ESB2JdfGCubEBTp7yt5M57z-FQUeYI1bmC37vNnsX0,20863
+maco/utils.py,sha256=Tjop6lfnb5LtkS0QruUzIO1NVnNkYi0i1I94CyjHL1Q,20895
 maco/yara.py,sha256=8RVaGyeUWY5f8_wfQ25lDX1bcXsb_VoSja85ZC2SqGw,2913
 maco/model/__init__.py,sha256=ULdyHx8R5D2ICHZo3VoCk1YTlewTok36TYIpwx__pNY,45
 maco/model/model.py,sha256=4uY88WphbP3iu-L2WjuYwtgZCS_wNul_hr0bAVuTpvc,23740
@@ -21,7 +21,7 @@ model_setup/maco/base_test.py,sha256=cjGLEy2c69wl9sjn74QFz7X-VxWOfdin4W8MvYsXc4Q
 model_setup/maco/cli.py,sha256=pPS8euWaLV-6csBCCzT1Mtc7GwP7a_RikDjfUYxoxU8,8415
 model_setup/maco/collector.py,sha256=cBZEHx5qjFwf-EfAgEmXlu4kT4rWZkcDE926gBrOoN8,7493
 model_setup/maco/extractor.py,sha256=uGSGiCQ4jd8jFmfw2T99BGcY5iQJzXHcG_RoTIxClTE,2802
-model_setup/maco/utils.py,sha256=-ESB2JdfGCubEBTp7yt5M57z-FQUeYI1bmC37vNnsX0,20863
+model_setup/maco/utils.py,sha256=Tjop6lfnb5LtkS0QruUzIO1NVnNkYi0i1I94CyjHL1Q,20895
 model_setup/maco/yara.py,sha256=8RVaGyeUWY5f8_wfQ25lDX1bcXsb_VoSja85ZC2SqGw,2913
 model_setup/maco/model/__init__.py,sha256=ULdyHx8R5D2ICHZo3VoCk1YTlewTok36TYIpwx__pNY,45
 model_setup/maco/model/model.py,sha256=4uY88WphbP3iu-L2WjuYwtgZCS_wNul_hr0bAVuTpvc,23740
@@ -36,9 +36,9 @@ tests/extractors/basic_longer.py,sha256=1ClU2QD-Y0TOl_loNFvEqIEpTR5TSVJ6zg9ZmC-E
 tests/extractors/test_basic.py,sha256=FLKekfSGM69HaiF7Vu_7D7KDXHZko-9hZkMO8_DoyYA,697
 tests/extractors/bob/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/extractors/bob/bob.py,sha256=G5aOoz58J0ZQK2_lA7HRxAzeLzBxssWxBTZcv1pSbi8,176
-maco-1.2.9.dist-info/LICENSE.md,sha256=gMSjshPhXvV_F1qxmeNkKdBqGWkd__fEJf4glS504bM,1478
-maco-1.2.9.dist-info/METADATA,sha256=zkoQkUI4Ll9ii6AkDJTi01Y0-53eNfgoNbqK5CyB6es,15892
-maco-1.2.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maco-1.2.9.dist-info/entry_points.txt,sha256=TpcwG1gedIg8Y7a9ZOv8aQpuwEUftCefDrAjzeP-o6U,39
-maco-1.2.9.dist-info/top_level.txt,sha256=iMRwuzmrHA3zSwiSeMIl6FWhzRpn_st-I4fAv-kw5_o,49
-maco-1.2.9.dist-info/RECORD,,
+maco-1.2.10.dist-info/LICENSE.md,sha256=gMSjshPhXvV_F1qxmeNkKdBqGWkd__fEJf4glS504bM,1478
+maco-1.2.10.dist-info/METADATA,sha256=FtHe8aMGg8ij5Z9RQ1alHpGYUA2hkCnPetwhKnVh8cE,15893
+maco-1.2.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maco-1.2.10.dist-info/entry_points.txt,sha256=TpcwG1gedIg8Y7a9ZOv8aQpuwEUftCefDrAjzeP-o6U,39
+maco-1.2.10.dist-info/top_level.txt,sha256=iMRwuzmrHA3zSwiSeMIl6FWhzRpn_st-I4fAv-kw5_o,49
+maco-1.2.10.dist-info/RECORD,,

{maco-1.2.9.dist-info → maco-1.2.10.dist-info}/WHEEL

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

model_setup/maco/utils.py

@@ -39,8 +39,8 @@ logger = logging.getLogger("maco.lib.utils")
 
 VENV_DIRECTORY_NAME = ".venv"
 
-RELATIVE_FROM_RE = re.compile(r"from (\.+)")
-RELATIVE_FROM_IMPORT_RE = re.compile(r"from (\.+) import")
+RELATIVE_FROM_RE = re.compile(rb"from (\.+)")
+RELATIVE_FROM_IMPORT_RE = re.compile(rb"from (\.+) import")
 
 UV_BIN = find_uv_bin()
 
@@ -171,19 +171,19 @@ def scan_for_extractors(root_directory: str, scanner: yara.Rules, logger: Logger
                 # Scan Python file for potential extractors
                 if package:
                     # Inspect the contents and look for any relative import issues
-                    with open(path, "r") as f:
+                    with open(path, "rb") as f:
                         data = f.read()
 
-                    with open(path, "w") as f:
+                    with open(path, "wb") as f:
                         # Replace any relative importing with absolute
                         curr_dir = os.path.dirname(path)
                         split = curr_dir.split("/")[::-1]
                         for pattern in [RELATIVE_FROM_IMPORT_RE, RELATIVE_FROM_RE]:
                             for match in pattern.findall(data):
-                                depth = match.count(".")
+                                depth = match.count(b".")
                                 abspath = ".".join(split[depth - 1 : split.index(package) + 1][::-1])
                                 abspath += "." if pattern == RELATIVE_FROM_RE else ""
-                                data = data.replace(f"from {match}", f"from {abspath}", 1)
+                                data = data.replace(f"from {match.decode()}".encode(), f"from {abspath}".encode(), 1)
                         f.write(data)
 
                 if scanner.match(path):