Refactoring / code cleanup.

See:

* https://en.wikipedia.org/wiki/Code_refactoring

* https://www.refactoring.com/

* https://www.joelonsoftware.com/2002/01/23/rub-a-dub-dub/

Some small optimisations may have slipped in as well.

.appveyor.yml

@@ -65,4 +65,3 @@ cache:
     - C:\_P5 -> .appveyor.yml
     - C:\strawberry -> .appveyor.yml
 shallow_clone: true
-

pysollib/games/spider.py

@@ -329,7 +329,7 @@ class Rachel(pysollib.game.StartDealRowAndCards, RelaxedSpider):
 # * Scorpion Tail - building down by alternate color
 # ************************************************************************
 
-class Scorpion_RowStack(Spider_RowStack, Yukon_SS_RowStack):
+class Scorpion_RowStack(Yukon_SS_RowStack, Spider_RowStack):
     canDropCards = Spider_RowStack.canDropCards
 
 

pysollib/stack.py

@@ -2474,6 +2474,8 @@ class BasicRowStack(OpenStack):
 
 # Abstract class.
 class SequenceRowStack(SequenceStack_StackMethods, BasicRowStack):
+    canMoveCards = OpenStack.canMoveCards
+
     def __init__(self, x, y, game, **cap):
         kwdefault(cap, max_move=999999, max_accept=999999)
         BasicRowStack.__init__(self, x, y, game, **cap)

run-tests.pl

@@ -18,7 +18,7 @@ my $abs_bindir = File::Spec->rel2abs($bindir);
 
 # Whether to use prove instead of runprove.
 my $use_prove = $ENV{FCS_USE_TEST_RUN} ? 0 : 1;
-my $num_jobs = $ENV{TEST_JOBS};
+my $num_jobs  = $ENV{TEST_JOBS};
 
 sub _is_parallized
 {
@@ -133,7 +133,7 @@ sub myglob
     );
 
     my $is_ninja = ( -e "build.ninja" );
-    my $MAKE = $IS_WIN ? 'gmake' : 'make';
+    my $MAKE     = $IS_WIN ? 'gmake' : 'make';
     if ($is_ninja)
     {
         system( "ninja", "pretest" );

tests/lib/pysol_tests/scorpion_canMove.py

@@ -39,17 +39,22 @@ class Mock_S_Game:
 
 
 class MyTests(unittest.TestCase):
-    def test_import(self):
+    def _calc_Scorpion_stack(self):
         g = MockGame()
         stack = Scorpion_RowStack(0, 0, g)
-        cards = [
+        for s, r in [(2, 5), (3, 7), (2, 7), (2, 0), (2, 3), (2, 4), (1, 4)]:
-            AbstractCard(1000+r*100+s*10, 0, s, r, g)
+            c = AbstractCard(1000+r*100+s*10, 0, s, r, g)
-            for s, r in [(2, 5), (3, 7), (2, 7), (2, 0),
-                         (2, 3), (2, 4), (1, 4)]
-            ]
-        for c in cards:
             c.face_up = True
             c.item = MockItem()
             stack.addCard(c)
+        return stack
+
+    def test_canMoveCards(self):
+        stack = self._calc_Scorpion_stack()
         stack.canMoveCards(stack.cards[6:])
         self.assertTrue(stack)
+
+    def test_canMoveCards_non_top(self):
+        stack = self._calc_Scorpion_stack()
+        self.assertTrue(stack.canMoveCards(stack.cards[4:]))
+        self.assertTrue(stack)