ruff reformatting

Author: Bilbin

src/patcherex2/targets/elf_x86_64_linux.py

@@ -23,14 +23,16 @@ def detect_target(binary_path):
             ):  # EM_X86_64
                 return True
         return False
-    
+
     def get_assembler(self, assembler):
-            assembler = assembler or "keystone"
-            if assembler == "keystone":
-                return Keystone(
-                    self.p, keystone.KS_ARCH_X86, keystone.KS_MODE_LITTLE_ENDIAN + keystone.KS_MODE_64
-                )
-            raise NotImplementedError()
+        assembler = assembler or "keystone"
+        if assembler == "keystone":
+            return Keystone(
+                self.p,
+                keystone.KS_ARCH_X86,
+                keystone.KS_MODE_LITTLE_ENDIAN + keystone.KS_MODE_64,
+            )
+        raise NotImplementedError()
 
     def get_allocation_manager(self, allocation_manager):
         allocation_manager = allocation_manager or "default"
@@ -47,7 +49,10 @@ def get_compiler(self, compiler):
     def get_disassembler(self, disassembler):
         disassembler = disassembler or "capstone"
         if disassembler == "capstone":
-            return Capstone(capstone.CS_ARCH_X86, capstone.CS_MODE_LITTLE_ENDIAN + capstone.CS_MODE_64)
+            return Capstone(
+                capstone.CS_ARCH_X86,
+                capstone.CS_MODE_LITTLE_ENDIAN + capstone.CS_MODE_64,
+            )
         raise NotImplementedError()
 
     def get_binfmt_tool(self, binfmt_tool):

tests/test_x86_64.py

@@ -43,13 +43,13 @@ def test_modify_instruction_patch(self):
         self.run_one(
             "printf_nopie",
             [
-                ModifyInstructionPatch(0x40113e, "lea rax, [0x402007]"),
+                ModifyInstructionPatch(0x40113E, "lea rax, [0x402007]"),
                 ModifyInstructionPatch(0x401145, "mov rsi, rax"),
             ],
             expected_output=b"%s",
             expected_returnCode=0,
         )
-    
+
     def test_insert_instruction_patch(self):
         instrs = """
             mov rax, 0x1
@@ -60,7 +60,7 @@ def test_insert_instruction_patch(self):
         """
         self.run_one(
             "printf_nopie",
-            [InsertInstructionPatch(0x40115c, instrs)],
+            [InsertInstructionPatch(0x40115C, instrs)],
             expected_output=b"Hi\x00Hi",
             expected_returnCode=0,
         )
@@ -75,7 +75,7 @@ def test_insert_instruction_patch_2(self):
             "printf_nopie",
             [
                 InsertInstructionPatch("return_0x32", instrs),
-                ModifyInstructionPatch(0x40115c, "jmp {return_0x32}"),
+                ModifyInstructionPatch(0x40115C, "jmp {return_0x32}"),
             ],
             expected_returnCode=0x32,
         )
@@ -107,7 +107,7 @@ def test_insert_data_patch(self, tlen=5):
             mov rdx, %s
             syscall
         """ % hex(tlen)
-        p2 = InsertInstructionPatch(0x40115c, instrs)
+        p2 = InsertInstructionPatch(0x40115C, instrs)
         self.run_one(
             "printf_nopie",
             [p1, p2],
@@ -160,45 +160,45 @@ def test_replace_function_patch_with_function_reference_and_rodata(self):
         )
 
     def run_one(
-            self,
-            filename,
-            patches,
-            set_oep=None,
-            inputvalue=None,
-            expected_output=None,
-            expected_returnCode=None,
-        ):
-            filepath = os.path.join(self.bin_location, filename)
-            pipe = subprocess.PIPE
-
-            with tempfile.TemporaryDirectory() as td:
-                tmp_file = os.path.join(td, "patched")
-                p = Patcherex(filepath)
-                for patch in patches:
-                    p.patches.append(patch)
-                p.apply_patches()
-                p.binfmt_tool.save_binary(tmp_file)
-                # os.system(f"readelf -hlS {tmp_file}")
-
-                p = subprocess.Popen(
-                    [tmp_file],
-                    stdin=pipe,
-                    stdout=pipe,
-                    stderr=pipe,
-                )
-                res = p.communicate(inputvalue)
-                if expected_output:
-                    if res[0] != expected_output:
-                        self.fail(
-                            f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}"
-                        )
-                    # self.assertEqual(res[0], expected_output)
-                if expected_returnCode:
-                    if p.returncode != expected_returnCode:
-                        self.fail(
-                            f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}"
-                        )
-                    # self.assertEqual(p.returncode, expected_returnCode)
+        self,
+        filename,
+        patches,
+        set_oep=None,
+        inputvalue=None,
+        expected_output=None,
+        expected_returnCode=None,
+    ):
+        filepath = os.path.join(self.bin_location, filename)
+        pipe = subprocess.PIPE
+
+        with tempfile.TemporaryDirectory() as td:
+            tmp_file = os.path.join(td, "patched")
+            p = Patcherex(filepath)
+            for patch in patches:
+                p.patches.append(patch)
+            p.apply_patches()
+            p.binfmt_tool.save_binary(tmp_file)
+            # os.system(f"readelf -hlS {tmp_file}")
+
+            p = subprocess.Popen(
+                [tmp_file],
+                stdin=pipe,
+                stdout=pipe,
+                stderr=pipe,
+            )
+            res = p.communicate(inputvalue)
+            if expected_output:
+                if res[0] != expected_output:
+                    self.fail(
+                        f"AssertionError: {res[0]} != {expected_output}, binary dumped: {self.dump_file(tmp_file)}"
+                    )
+                # self.assertEqual(res[0], expected_output)
+            if expected_returnCode:
+                if p.returncode != expected_returnCode:
+                    self.fail(
+                        f"AssertionError: {p.returncode} != {expected_returnCode}, binary dumped: {self.dump_file(tmp_file)}"
+                    )
+                # self.assertEqual(p.returncode, expected_returnCode)
 
     def dump_file(self, file):
         shutil.copy(file, "/tmp/patcherex_failed_binary")