linting

Author: amitgilad3

pyiceberg/io/pyarrow.py

@@ -936,24 +936,17 @@ def _read_delete_file(fs: FileSystem, data_file: DataFile) -> Iterator[PositionD
 
 
 def _read_deletes(fs: FileSystem, data_file: DataFile) -> Dict[str, pa.ChunkedArray]:
-<<<<<<< HEAD
     if data_file.file_format == FileFormat.PARQUET:
         deletes_by_file: Dict[str, List[int]] = {}
         for delete in _read_delete_file(fs, data_file):
-            if delete.file_path not in deletes_by_file:
-                deletes_by_file[delete.file_path] = []
-            deletes_by_file[delete.file_path].append(delete.pos)
-=======
-    deletes_by_file: Dict[str, List[int]] = {}
-    for delete in _read_delete_file(fs, data_file):
-        if delete.path not in deletes_by_file:
-            deletes_by_file[delete.path] = []
-        deletes_by_file[delete.path].append(delete.pos)
->>>>>>> e4ed25e (fix if statment)
+            if delete.path not in deletes_by_file:
+                deletes_by_file[delete.path] = []
+            deletes_by_file[delete.path].append(delete.pos)
 
         # Convert lists of positions to ChunkedArrays
         return {
-            file_path: pa.chunked_array([pa.array(positions, type=pa.int64())]) for file_path, positions in deletes_by_file.items()
+            file_path: pa.chunked_array([pa.array(positions, type=pa.int64())])
+            for file_path, positions in deletes_by_file.items()
         }
     elif data_file.file_format == FileFormat.PUFFIN:
         _, _, path = PyArrowFileIO.parse_location(data_file.file_path)
@@ -964,6 +957,7 @@ def _read_deletes(fs: FileSystem, data_file: DataFile) -> Dict[str, pa.ChunkedAr
     else:
         raise ValueError(f"Delete file format not supported: {data_file.file_format}")
 
+
 def _combine_positional_deletes(positional_deletes: List[pa.ChunkedArray], start_index: int, end_index: int) -> pa.Array:
     if len(positional_deletes) == 1:
         all_chunks = positional_deletes[0]

pyiceberg/table/inspect.py

@@ -761,7 +761,7 @@ def all_data_files(self) -> "pa.Table":
     def all_delete_files(self) -> "pa.Table":
         return self._all_files({DataFileContent.POSITION_DELETES, DataFileContent.EQUALITY_DELETES})
 
-   def position_deletes(self, snapshot_id: Optional[int] = None) -> "pa.Table":
+    def position_deletes(self, snapshot_id: Optional[int] = None) -> "pa.Table":
         import pyarrow as pa
 
         snapshot = self._get_snapshot(snapshot_id) if snapshot_id else self.tbl.current_snapshot()