Merge branch 'master' into staging

kevoreilly · Feb 7, 2025 · 54de070 · 54de070
2 parents 07b9f84 + ab10529
commit 54de070
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/cuckoo/common/integrations/pyinstxtractor.py b/lib/cuckoo/common/integrations/pyinstxtractor.py
@@ -83,7 +83,6 @@
 - The header of all extracted pyc's are now automatically fixed
 """
 
-from __future__ import print_function
 import logging
 import marshal
 import os
@@ -188,7 +187,7 @@ def getCArchiveInfo(self):
             return False
 
         self.pymaj, self.pymin = (pyver // 100, pyver % 100) if pyver >= 100 else (pyver // 10, pyver % 10)
-        log.debug("[+] Python version: {0}.{1}".format(self.pymaj, self.pymin))
+        log.debug("[+] Python version: %d.%d", self.pymaj, self.pymin)
 
         # Additional data after the cookie
         tailBytes = (

diff --git a/lib/cuckoo/common/load_extra_modules.py b/lib/cuckoo/common/load_extra_modules.py
@@ -9,6 +9,7 @@
 
 selfextract_conf = Config("selfextract")
 
+
 def ratdecodedr_load_decoders(path: str):
     from malwareconfig.common import Decoder
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@

		selfextract_conf = Config("selfextract")


		def ratdecodedr_load_decoders(path: str):
		from malwareconfig.common import Decoder

Expand Down