maco 1.2.14__py3-none-any.whl → 1.2.16__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. demo_extractors/complex/complex.py +12 -0
  2. demo_extractors/complex/complex_utils.py +11 -2
  3. demo_extractors/elfy.py +12 -0
  4. demo_extractors/limit_other.py +15 -0
  5. demo_extractors/nothing.py +11 -3
  6. demo_extractors/shared.py +6 -0
  7. demo_extractors/terminator.py +12 -1
  8. maco/base_test.py +24 -7
  9. maco/cli.py +19 -5
  10. maco/collector.py +25 -9
  11. maco/exceptions.py +31 -1
  12. maco/extractor.py +7 -8
  13. maco/model/model.py +34 -0
  14. maco/utils.py +139 -83
  15. maco/yara.py +47 -5
  16. {maco-1.2.14.dist-info → maco-1.2.16.dist-info}/METADATA +3 -3
  17. maco-1.2.16.dist-info/RECORD +49 -0
  18. {maco-1.2.14.dist-info → maco-1.2.16.dist-info}/WHEEL +1 -1
  19. model_setup/maco/base_test.py +24 -7
  20. model_setup/maco/cli.py +19 -5
  21. model_setup/maco/collector.py +25 -9
  22. model_setup/maco/exceptions.py +31 -1
  23. model_setup/maco/extractor.py +7 -8
  24. model_setup/maco/model/model.py +34 -0
  25. model_setup/maco/utils.py +139 -83
  26. model_setup/maco/yara.py +47 -5
  27. tests/extractors/basic.py +10 -2
  28. tests/extractors/basic_longer.py +9 -2
  29. tests/extractors/bob/bob.py +2 -0
  30. tests/extractors/import_rewriting/__init__.py +0 -0
  31. tests/extractors/import_rewriting/importer.py +10341 -0
  32. tests/extractors/test_basic.py +4 -0
  33. maco-1.2.14.dist-info/RECORD +0 -47
  34. {maco-1.2.14.dist-info → maco-1.2.16.dist-info}/entry_points.txt +0 -0
  35. {maco-1.2.14.dist-info → maco-1.2.16.dist-info/licenses}/LICENSE.md +0 -0
  36. {maco-1.2.14.dist-info → maco-1.2.16.dist-info}/top_level.txt +0 -0
tests/extractors/basic.py CHANGED
@@ -1,5 +1,7 @@
1
+ """Basic extractor."""
2
+
1
3
  from io import BytesIO
2
- from typing import List, Optional
4
+ from typing import List
3
5
 
4
6
  from maco import extractor, model, yara
5
7
 
@@ -21,7 +23,13 @@ class Basic(extractor.Extractor):
21
23
  }
22
24
  """
23
25
 
24
- def run(self, stream: BytesIO, matches: List[yara.Match]) -> Optional[model.ExtractorModel]:
26
+ def run(self, stream: BytesIO, matches: List[yara.Match]) -> model.ExtractorModel:
27
+ """Run the extractor.
28
+
29
+ Returns:
30
+ (model.ExtractorModel): Results from extractor
31
+
32
+ """
25
33
  # use a custom model that inherits from ExtractorModel
26
34
  # this model defines what can go in the 'other' dict
27
35
  tmp = model.ExtractorModel(family="basic")
tests/extractors/basic_longer.py CHANGED
@@ -1,5 +1,7 @@
1
+ """Basic longer extractor."""
2
+
1
3
  from io import BytesIO
2
- from typing import List, Optional
4
+ from typing import List
3
5
 
4
6
  from maco import extractor, model, yara
5
7
 
@@ -21,7 +23,12 @@ class BasicLonger(extractor.Extractor):
21
23
  }
22
24
  """
23
25
 
24
- def run(self, stream: BytesIO, matches: List[yara.Match]) -> Optional[model.ExtractorModel]:
26
+ def run(self, stream: BytesIO, matches: List[yara.Match]) -> model.ExtractorModel:
27
+ """Run the extractor.
28
+
29
+ Returns:
30
+ (model.ExtractorModel): Results from extractor
31
+ """
25
32
  # use a custom model that inherits from ExtractorModel
26
33
  # this model defines what can go in the 'other' dict
27
34
  tmp = model.ExtractorModel(family="basic_longer")
tests/extractors/bob/bob.py CHANGED
@@ -1,3 +1,5 @@
1
+ """Simple extractor for testing module and submodule with the same name."""
2
+
1
3
  from maco import extractor
2
4
 
3
5
 
tests/extractors/import_rewriting/__init__.py ADDED
File without changes