Use magic-comment pylint suppressions.

diff --git a/Makefile b/Makefile
index 914d3d10e330677a937e3a78c49a5f2caca3e679..8cc3ca550d7cf84a52a40d9aa7b60e1f924abfea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,14 +31,8 @@ dist: sst-$(VERS).tar.gz
 check: pylint
        cd test; $(MAKE) --quiet
 
 check: pylint
        cd test; $(MAKE) --quiet
 

-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,R1711,R1714,R1716,R1723,R1724,R1706,R1710,W0110,W0123,W0141,W0232,W0312,W0603,W0611

 pylint:
 pylint:

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

 
 clean:
        rm -f sst.6 sst.html
 
 clean:
        rm -f sst.6 sst.html

diff --git a/sst.py b/sst.py
index 61650143d5b9b56baaedb0a53c57b7cd848620d7..e3959641877d691bc70a221b06d04a0783537c3d 100755 (executable)
--- a/sst.py
+++ b/sst.py
@@ -15,6 +15,9 @@ from __future__ import print_function, division
 # Runs under Python 2 an Python 3. Preserve this property!
 # SPDX-License-Identifier: BSD-2-clause
 
 # Runs under Python 2 an Python 3. Preserve this property!
 # SPDX-License-Identifier: BSD-2-clause
 

+# pylint: disable=line-too-long,superfluous-parens,too-many-lines,invalid-name,missing-function-docstring,missing-class-docstring,multiple-statements,too-many-branches,too-many-statements,too-many-locals,too-many-nested-blocks,too-many-return-statements,too-many-instance-attributes,global-statement,no-else-break,no-else-return,no-else-continue,too-few-public-methods,too-many-boolean-expressions
+
+# pylint: disable=multiple-imports

 import os, sys, math, curses, time, pickle, copy, gettext, getpass
 import getopt, socket, locale
 import codecs
 import os, sys, math, curses, time, pickle, copy, gettext, getpass
 import getopt, socket, locale
 import codecs


@@ -22,6 +25,7 @@ import codecs
 # This import only works on Unixes.  The intention is to enable
 # Ctrl-P, Ctrl-N, and friends in Cmd.
 try:
 # This import only works on Unixes.  The intention is to enable
 # Ctrl-P, Ctrl-N, and friends in Cmd.
 try:

+    # pylint: disable=unused-import

     import readline
 except ImportError:
     pass
     import readline
 except ImportError:
     pass


@@ -1246,7 +1250,6 @@ def collision(rammed, enemy):
         damagereport()
     else:
         finish(FWON)
         damagereport()
     else:
         finish(FWON)

-    return

 
 def torpedo(origin, bearing, dispersion, number, nburst):
     "Let a photon torpedo fly"
 
 def torpedo(origin, bearing, dispersion, number, nburst):
     "Let a photon torpedo fly"


@@ -1331,7 +1334,7 @@ def torpedo(origin, bearing, dispersion, number, nburst):
                     bumpto = displacement.sector()
                     if not bumpto.valid_sector():
                         prout(_(" damaged but not destroyed."))
                     bumpto = displacement.sector()
                     if not bumpto.valid_sector():
                         prout(_(" damaged but not destroyed."))

-                        return
+                        return None

                     if game.quad[bumpto.i][bumpto.j] == ' ':
                         prout(_(" buffeted into black hole."))
                         deadkl(w, iquad, bumpto)
                     if game.quad[bumpto.i][bumpto.j] == ' ':
                         prout(_(" buffeted into black hole."))
                         deadkl(w, iquad, bumpto)


@@ -1902,6 +1905,7 @@ def hittem(hits):
                 return
             continue
         else: # decide whether or not to emasculate klingon
                 return
             continue
         else: # decide whether or not to emasculate klingon

+            # pylint: disable=chained-comparison

             if kpow > 0 and rnd.withprob(0.9) and kpow <= rnd.real(0.4, 0.8)*kpini:
                 prout(_("***Mr. Spock-  \"Captain, the vessel at Sector %s")%w)
                 prout(_("   has just lost its firepower.\""))
             if kpow > 0 and rnd.withprob(0.9) and kpow <= rnd.real(0.4, 0.8)*kpini:
                 prout(_("***Mr. Spock-  \"Captain, the vessel at Sector %s")%w)
                 prout(_("   has just lost its firepower.\""))


@@ -2873,7 +2877,7 @@ def supernova(w):
             proutn("=== Super nova here?")
             if ja():
                 nq = game.quadrant
             proutn("=== Super nova here?")
             if ja():
                 nq = game.quadrant

-    if not nq == game.quadrant or game.justin:
+    if nq != game.quadrant or game.justin:

         # it isn't here, or we just entered (treat as enroute)
         if communicating():
             skip(1)
         # it isn't here, or we just entered (treat as enroute)
         if communicating():
             skip(1)


@@ -2936,7 +2940,7 @@ def supernova(w):
     if game.quadrant == nq or communicating():
         game.state.galaxy[nq.i][nq.j].supernova = True
     # If supernova destroys last Klingons give special message
     if game.quadrant == nq or communicating():
         game.state.galaxy[nq.i][nq.j].supernova = True
     # If supernova destroys last Klingons give special message

-    if game.unwon()==0 and not nq == game.quadrant:
+    if game.unwon()==0 and nq != game.quadrant:

         skip(2)
         if w is None:
             prout(_("Lucky you!"))
         skip(2)
         if w is None:
             prout(_("Lucky you!"))


@@ -3699,7 +3703,7 @@ def tracktorpedo(w, step, i, n, iquad):
             else:
                 skip(1)
                 proutn(_("Torpedo track- "))
             else:
                 skip(1)
                 proutn(_("Torpedo track- "))

-        elif step==4 or step==9:
+        elif step in {4, 9}:

             skip(1)
         proutn("%s   " % w)
     else:
             skip(1)
         proutn("%s   " % w)
     else:


@@ -3707,7 +3711,7 @@ def tracktorpedo(w, step, i, n, iquad):
             if i != 0 and step == 1:
                 drawmaps(2)
                 time.sleep(0.4)
             if i != 0 and step == 1:
                 drawmaps(2)
                 time.sleep(0.4)

-            if (iquad=='.') or (iquad==' '):
+            if iquad in {'.', ' '}:

                 put_srscan_sym(w, '+')
                 #sound(step*10)
                 #time.sleep(0.1)
                 put_srscan_sym(w, '+')
                 #sound(step*10)
                 #time.sleep(0.1)


@@ -3901,7 +3905,6 @@ def imove(icourse=None, noattack=False):
     newcnd()
     drawmaps(0)
     setwnd(message_window)
     newcnd()
     drawmaps(0)
     setwnd(message_window)

-    return

 
 def dock(verbose):
     "Dock our ship at a starbase."
 
 def dock(verbose):
     "Dock our ship at a starbase."


@@ -5161,6 +5164,7 @@ def attackreport(curt):
 def report():
     # report on general game status
     scanner.chew()
 def report():
     # report on general game status
     scanner.chew()

+    # pylint: disable=consider-using-ternary

     s1 = (game.thawed and _("thawed ")) or ""
     s2 = {1:"short", 2:"medium", 4:"long"}[game.length]
     s3 = (None, _("novice"), _("fair"),
     s1 = (game.thawed and _("thawed ")) or ""
     s2 = {1:"short", 2:"medium", 4:"long"}[game.length]
     s3 = (None, _("novice"), _("fair"),


@@ -6665,7 +6669,7 @@ def debugme():
             proutn(legends[i])
             if is_scheduled(i):
                 proutn("%.2f" % (scheduled(i)-game.state.date))
             proutn(legends[i])
             if is_scheduled(i):
                 proutn("%.2f" % (scheduled(i)-game.state.date))

-                if i == FENSLV or i == FREPRO:
+                if i in {FENSLV, FREPRO}:

                     ev = findevent(i)
                     proutn(" in %s" % ev.quadrant)
             else:
                     ev = findevent(i)
                     proutn(" in %s" % ev.quadrant)
             else:


@@ -6678,7 +6682,7 @@ def debugme():
                 scanner.chew()
             elif key == "IHREAL":
                 ev = schedule(i, scanner.real)
                 scanner.chew()
             elif key == "IHREAL":
                 ev = schedule(i, scanner.real)

-                if i == FENSLV or i == FREPRO:
+                if i in {FENSLV, FREPRO}:

                     scanner.chew()
                     proutn("In quadrant- ")
                     key = scanner.nexttok()
                     scanner.chew()
                     proutn("In quadrant- ")
                     key = scanner.nexttok()


@@ -6720,14 +6724,17 @@ if __name__ == '__main__':
         replay = False
         for (switch, val) in options:
             if switch == '-r':
         replay = False
         for (switch, val) in options:
             if switch == '-r':

+                # pylint: disable=raise-missing-from

                 try:
                     replayfp = open(val, "r")
                 except IOError:
                     sys.stderr.write("sst: can't open replay file %s\n" % val)
                     raise SystemExit(1)
                 try:
                     replayfp = open(val, "r")
                 except IOError:
                     sys.stderr.write("sst: can't open replay file %s\n" % val)
                     raise SystemExit(1)

+                # pylint: disable=raise-missing-from

                 try:
                     line = replayfp.readline().strip()
                     (leader, __, seed) = line.split()
                 try:
                     line = replayfp.readline().strip()
                     (leader, __, seed) = line.split()

+                    # pylint: disable=eval-used

                     seed = eval(seed)
                     line = replayfp.readline().strip()
                     arguments += line.split()[2:]
                     seed = eval(seed)
                     line = replayfp.readline().strip()
                     arguments += line.split()[2:]