ci: Merge branch 'mathern/sign-file' into mathern/add-extension-guessing

Author: tmathern

src/c2pa/c2pa.py

@@ -761,7 +761,7 @@ def sign_file(
 
                 # Use the builder's internal signing logic to get manifest
                 # bytes
-                result, manifest_bytes = builder._sign_internal(
+                manifest_bytes = builder._sign_internal(
                     signer, mime_type, source_stream, dest_stream)
 
                 return manifest_bytes
@@ -1975,7 +1975,7 @@ def _sign_internal(
                         # Ignore errors during cleanup
                         pass
 
-            return result, manifest_bytes
+            return manifest_bytes
         finally:
             # Ensure both streams are cleaned up
             source_stream.close()
@@ -2043,9 +2043,8 @@ def sign_file(self,
             dest_stream = Stream(dest_file)
 
             # Use the internal stream-base signing logic
-            result, manifest_bytes = self._sign_internal(
+            return self._sign_internal(
                 signer, mime_type, source_stream, dest_stream)
-            return result, manifest_bytes
 
 
 def format_embeddable(format: str, manifest_bytes: bytes) -> tuple[int, bytes]:

tests/test_unit_tests.py

@@ -359,7 +359,7 @@ def test_remote_sign_using_returned_bytes(self):
             builder = Builder(self.manifestDefinition)
             builder.set_no_embed()
             with io.BytesIO() as output_buffer:
-                _, manifest_data = builder.sign(
+                manifest_data = builder.sign(
                     self.signer, "image/jpeg", file, output_buffer)
                 output_buffer.seek(0)
                 read_buffer = io.BytesIO(output_buffer.getvalue())
@@ -732,7 +732,7 @@ def test_builder_set_remote_url(self):
             builder.sign(self.signer, "image/jpeg", file, output)
             output.seek(0)
             d = output.read()
-            self.assertIn(b'provenance="http://this_does_not_exist/foo.jpg"', d)    
+            self.assertIn(b'provenance="http://this_does_not_exist/foo.jpg"', d)
 
     def test_builder_set_remote_url_no_embed(self):
         """Test setting the remote url of a builder with no embed flag."""
@@ -763,7 +763,7 @@ def test_sign_file(self):
 
             # Use the sign_file method
             builder = Builder(self.manifestDefinition)
-            result, manifest_bytes = builder.sign_file(
+            manifest_bytes = builder.sign_file(
                 source_path=self.testPath,
                 dest_path=output_path,
                 signer=self.signer
@@ -772,11 +772,6 @@ def test_sign_file(self):
             # Verify the output file was created
             self.assertTrue(os.path.exists(output_path))
 
-            # Verify we got both result and manifest bytes
-            self.assertIsInstance(result, int)
-            self.assertIsInstance(manifest_bytes, bytes)
-            self.assertGreater(len(manifest_bytes), 0)
-
             # Read the signed file and verify the manifest
             with open(output_path, "rb") as file:
                 reader = Reader("image/jpeg", file)
@@ -953,7 +948,7 @@ def test_sign_file_callback_signer(self):
                 tsa_url="http://timestamp.digicert.com"
             )
 
-            result, manifest_bytes = builder.sign_file(
+            manifest_bytes = builder.sign_file(
                 source_path=self.testPath,
                 dest_path=output_path,
                 signer=signer
@@ -963,7 +958,6 @@ def test_sign_file_callback_signer(self):
             self.assertTrue(os.path.exists(output_path))
 
             # Verify results
-            self.assertIsInstance(result, int)
             self.assertIsInstance(manifest_bytes, bytes)
             self.assertGreater(len(manifest_bytes), 0)
 
@@ -1001,15 +995,14 @@ def test_sign_file_callback_signer_managed(self):
             ) as signer:
 
                 # Sign the file
-                result, manifest_bytes = builder.sign_file(
+                manifest_bytes = builder.sign_file(
                     source_path=self.testPath,
                     dest_path=output_path,
                     signer=signer
                 )
 
             # Verify results
             self.assertTrue(os.path.exists(output_path))
-            self.assertIsInstance(result, int)
             self.assertIsInstance(manifest_bytes, bytes)
             self.assertGreater(len(manifest_bytes), 0)
 
@@ -1048,30 +1041,28 @@ def test_sign_file_callback_signer_managed_multiple_uses(self):
 
                 # First signing operation
                 output_path_1 = os.path.join(temp_dir, "signed_output_1.jpg")
-                result_1, manifest_bytes_1 = builder.sign_file(
+                manifest_bytes_1 = builder.sign_file(
                     source_path=self.testPath,
                     dest_path=output_path_1,
                     signer=signer
                 )
 
                 # Verify first signing was successful
                 self.assertTrue(os.path.exists(output_path_1))
-                self.assertIsInstance(result_1, int)
                 self.assertIsInstance(manifest_bytes_1, bytes)
                 self.assertGreater(len(manifest_bytes_1), 0)
 
                 # Second signing operation with the same signer
                 # This is to verify we don't free the signer or the callback too early
                 output_path_2 = os.path.join(temp_dir, "signed_output_2.jpg")
-                result_2, manifest_bytes_2 = builder.sign_file(
+                manifest_bytes_2 = builder.sign_file(
                     source_path=self.testPath,
                     dest_path=output_path_2,
                     signer=signer
                 )
 
                 # Verify second signing was successful
                 self.assertTrue(os.path.exists(output_path_2))
-                self.assertIsInstance(result_2, int)
                 self.assertIsInstance(manifest_bytes_2, bytes)
                 self.assertGreater(len(manifest_bytes_2), 0)
 
@@ -1114,7 +1105,7 @@ def test_builder_sign_file_callback_signer_from_callback(self):
                 tsa_url="http://timestamp.digicert.com"
             )
 
-            result, manifest_bytes = builder.sign_file(
+            manifest_bytes = builder.sign_file(
                 source_path=self.testPath,
                 dest_path=output_path,
                 signer=signer
@@ -1124,7 +1115,6 @@ def test_builder_sign_file_callback_signer_from_callback(self):
             self.assertTrue(os.path.exists(output_path))
 
             # Verify results
-            self.assertIsInstance(result, int)
             self.assertIsInstance(manifest_bytes, bytes)
             self.assertGreater(len(manifest_bytes), 0)
 
@@ -1333,7 +1323,7 @@ def error_callback_signer(data: bytes) -> bytes:
 
             # The signing operation should fail due to the error callback
             with self.assertRaises(Error):
-                result, manifest_bytes = builder.sign_file(
+                builder.sign_file(
                     source_path=self.testPath,
                     dest_path=output_path,
                     signer=signer