Fix merge issues

squirrelbattle/game.py

@@ -420,7 +420,7 @@ class Game:
         except KeyError as error:
             self.message = _("Some keys are missing in your save file.\n"
                              "Your save seems to be corrupt. It got deleted.")\
-                           + f"\n{error}"
+                + f"\n{error}"
             os.unlink(ResourceManager.get_config_path("save.json"))
             self.display_actions(DisplayActions.UPDATE)
             return

squirrelbattle/interfaces.py

@@ -7,7 +7,7 @@ from functools import reduce
 from itertools import product
 from math import ceil, sqrt
 from queue import PriorityQueue
-from random import choice, choices, randint
+from random import choice, randint
 from typing import Any, Dict, List, Optional, Tuple
 
 from .display.texturepack import TexturePack

squirrelbattle/mapgeneration/broguelike.py

@@ -1,10 +1,10 @@
 # Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from random import random, randint, shuffle, choice, choices
+from random import choice, choices, randint, random, shuffle
 from typing import List, Tuple
 
-from ..interfaces import Map, Tile, Entity
+from ..interfaces import Entity, Map, Tile
 
 DEFAULT_PARAMS = {
     "width": 120,

squirrelbattle/tests/mapgeneration_test.py

@@ -1,13 +1,13 @@
 # Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import unittest
 from random import randint
 from typing import List
+import unittest
 
-from squirrelbattle.interfaces import Map, Tile
-from squirrelbattle.mapgeneration import broguelike
-from squirrelbattle.display.texturepack import TexturePack
+from ..display.texturepack import TexturePack
+from ..interfaces import Map, Tile
+from ..mapgeneration import broguelike
 
 
 class TestBroguelike(unittest.TestCase):