fix merge

spinnman/spalloc/spalloc_job.py

@@ -12,13 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Dict, Tuple
 from contextlib import AbstractContextManager
-from sqlite3 import Cursor
-from typing import Dict, Optional, Tuple
-from typing_extensions import Self
+from typing import Dict, Tuple, Mapping
 from spinn_utilities.abstract_base import AbstractBase, abstractmethod
-from spinn_utilities.typing.coords import XY
 from spinnman.constants import SCP_SCAMP_PORT
 from spinnman.transceiver import Transceiver
 from spinnman.connections.udp_packet_connections import UDPConnection
@@ -197,19 +193,14 @@ def where_is_machine(self, x: int, y: int) -> Tuple[int, int, int]:
         """
 
     @abstractmethod
-    def _write_session_credentials_to_db(self, cur: Cursor):
+    def get_session_credentials_for_db(self) -> Mapping[str, str]:
         """
-        Write the session credentials for the job to the database accessed by
-        the given cursor.
+        Get the session credentials for the job to be written into a database
 
         .. note::
             May assume that there is a ``proxy_configuration`` table with
             ``kind``, ``name`` and ``value`` columns.
-
-        :param ~sqlite3.Cursor cur:
-            The open cursor to the database.
         """
-
     def __enter__(self):
         """
         Return self on entering context.