pylint cleanup - found an actual bug this time!

diff --git a/Makefile b/Makefile
index 9e6b9cf5885bc2254498e2f506e9eb0aeb7b8a2b..27f0ad022452f877dbb83e81a641acdebf496d60 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ check: #pylint
 COMMON_PYLINT = --rcfile=/dev/null --reports=n \
        --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
        --dummy-variables-rgx='^_'
 COMMON_PYLINT = --rcfile=/dev/null --reports=n \
        --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
        --dummy-variables-rgx='^_'

-PYLINTOPTS = $(COMMON_PYLINT) --disable=C0103,C0111,C0113,C1001,C0301,C0302,C0321,C0325,C0326,C0410,C1801,E1120,R0101,R0902,R0903,R0911,R0912,R0914,R0915,R0916,R1705,R1706,R1710,W0110,W0123,W0141,W0232,W0312,W0603,W0611
+PYLINTOPTS = $(COMMON_PYLINT) --disable=C0103,C0111,C0113,C1001,C0301,C0302,C0321,C0325,C0326,C0410,C1801,E1120,R0101,R0902,R0903,R0911,R0912,R0914,R0915,R0916,R1705,R1711,R1714,R1716,R1723,R1724,R1706,R1710,W0110,W0123,W0141,W0232,W0312,W0603,W0611

 pylint:
        @pylint --output-format=parseable $(PYLINTOPTS) sst.py
 
 pylint:
        @pylint --output-format=parseable $(PYLINTOPTS) sst.py
 

diff --git a/sst.py b/sst.py
index aa91753a9cb67f0c56bf9973c4499469b8c0a589..8edb61b3022bc6dd1132cbba0d724d6718ebad2e 100755 (executable)
--- a/sst.py
+++ b/sst.py
@@ -2859,7 +2859,7 @@ def supernova(w):
         for nq.i in range(GALSIZE):
             for nq.j in range(GALSIZE):
                 nstars += game.state.galaxy[nq.i][nq.j].stars
         for nq.i in range(GALSIZE):
             for nq.j in range(GALSIZE):
                 nstars += game.state.galaxy[nq.i][nq.j].stars

-        if stars == 0:
+        if nstars == 0:

             return # nothing to supernova exists
         num = rnd.integer(nstars) + 1
         for nq.i in range(GALSIZE):
             return # nothing to supernova exists
         num = rnd.integer(nstars) + 1
         for nq.i in range(GALSIZE):


@@ -5359,7 +5359,6 @@ def sectscan(goodScan, i, j):
                        'T':LIGHTRED,
                        '@':LIGHTGREEN,
                        'P':LIGHTGREEN,
                        'T':LIGHTRED,
                        '@':LIGHTGREEN,
                        'P':LIGHTGREEN,

-                       '?':MAGENTA,

                       }.get(game.quad[i][j], DEFAULT))
         proutn("%c " % game.quad[i][j])
         textcolor(DEFAULT)
                       }.get(game.quad[i][j], DEFAULT))
         proutn("%c " % game.quad[i][j])
         textcolor(DEFAULT)