tradedangerous 10.17.0__py3-none-any.whl → 11.0.0__py3-none-any.whl

tradedangerous/cli.py

@@ -31,11 +31,6 @@
 # cool, please see the TradeDB and TradeCalc modules. TD is designed
 # to empower other programmers to do cool stuff.
 
-from __future__ import absolute_import
-from __future__ import with_statement
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
 import os
 import traceback
 
@@ -58,7 +53,7 @@ def main(argv = None):
             "\tBug Tracker: https://github.com/eyeonus/Trade-Dangerous/issues\n"
             "\tDocumentation: https://github.com/eyeonus/Trade-Dangerous/wiki\n"
             "\tEDForum Thread: https://forums.frontier.co.uk/showthread.php/441509\n"
-            )
+        )
     from . import tradeexcept
     
     try:
@@ -78,7 +73,7 @@ def main(argv = None):
             if 'EXCEPTIONS' in os.environ:
                 raise e
             sys.exit(1)
-    except (UnicodeEncodeError, UnicodeDecodeError) as e:
+    except (UnicodeEncodeError, UnicodeDecodeError):
         print("-----------------------------------------------------------")
         print("ERROR: Unexpected unicode error in the wild!")
         print()

tradedangerous/commands/TEMPLATE.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from commands.commandenv import ResultRow
 from commands.parsing import *
 from formatting import RowFormat, ColumnFormat
@@ -59,4 +58,4 @@ def render(results, cmdenv, tdb):
     This is where you should generate any output from your command.
     """
     
-    ### TODO: Implement
+    ### TODO: Implement

tradedangerous/commands/__init__.py

@@ -1,9 +1,7 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from .commandenv import CommandEnv
 from textwrap import TextWrapper
 
 import argparse  # For parsing command line args.
-import importlib
 import os
 import pathlib
 import sys
@@ -63,7 +61,7 @@ def addArguments(group, options, required, topGroup = None):
             parsing.registerParserHelpers(exGrp)
             addArguments(exGrp, option.arguments, required, topGroup = group)
         else:
-            assert not required in option.kwargs
+            assert required not in option.kwargs
             if option.args[0][0] == '-':
                 group.add_argument(*(option.args), required = required, **(option.kwargs))
             else:
@@ -84,7 +82,7 @@ def _findFromFile(cmd, prefix = '.tdrc'):
     return None
 
 
-class CommandIndex(object):
+class CommandIndex:
     
     def usage(self, argv):
         """

tradedangerous/commands/buildcache_cmd.py

@@ -1,8 +1,6 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-import sys
-
+from __future__ import annotations
 from .exceptions import CommandLineError
-from .parsing import *
+from .parsing import ParseArgument
 from ..cache import buildCache
 from ..tradedb import TradeDB
 
@@ -54,19 +52,16 @@ switches = [
 # Perform query and populate result set
 
 
-def run(results, cmdenv, tdb):
+def run(results, cmdenv, tdb: TradeDB):
     # Check that the file doesn't already exist.
     if not cmdenv.force:
         if tdb.dbPath.exists():
             raise CommandLineError(
-                    "SQLite3 database '{}' already exists.\n"
-                     "Either remove the file first or use the '-f' option."
-                        .format(tdb.dbFilename))
+                "SQLite3 database '{tdb.dbFilename}' already exists.\n"
+                "Either remove the file first or use the '-f' option.")
     
     if not tdb.sqlPath.exists():
-        raise CommandLineError(
-                    "SQL File does not exist: {}"
-                        .format(tdb.sqlFilename))
+        raise CommandLineError("SQL File does not exist: {tdb.sqlFilename}")
     
     buildCache(tdb, cmdenv)
     

tradedangerous/commands/buy_cmd.py

@@ -1,12 +1,14 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
+from __future__ import annotations
 from collections import defaultdict
 from .commandenv import ResultRow
-from .exceptions import *
-from .parsing import *
-from ..formatting import RowFormat, ColumnFormat, max_len
-from ..tradedb import TradeDB, AmbiguityError, System, Station
+from .exceptions import CommandLineError, NoDataError
+from ..formatting import RowFormat, max_len
+from ..tradedb import Station, System, TradeDB
+from .parsing import (
+    AvoidPlacesArgument, BlackMarketSwitch, FleetCarrierArgument, MutuallyExclusiveGroup,
+    NoPlanetSwitch, OdysseyArgument, PadSizeArgument, ParseArgument, PlanetaryArgument,
+)
 
-import math
 
 ITEM_MODE = "Item"
 SHIP_MODE = "Ship"
@@ -114,7 +116,7 @@ def get_lookup_list(cmdenv, tdb):
         name for names in cmdenv.name for name in names.split(',')
     ]
     # We only support searching for one type of purchase a time: ship or item.
-    # Our first match is open ended, but once we have matched one type of
+    # Our first match is open-ended, but once we have matched one type of
     # thing, the remaining arguments are all sourced from the same pool.
     # Thus: [food, cobra, metals] is illegal but [metals, hydrogen] is legal.
     mode = None
@@ -401,8 +403,5 @@ def render(results, cmdenv, tdb):
         print(stnRowFmt.format(row))
     
     if singleMode and cmdenv.detail:
-        print("{:{lnl}} {:>10n}".format(
-                "-- Ship Cost" if mode is SHIP_MODE else "-- Average",
-                results.summary.avg,
-                lnl = maxStnLen,
-        ))
+        msg = "-- Ship Cost" if mode is SHIP_MODE else "-- Average",
+        print(f"{msg:{maxStnLen}} {results.summary.avg:>10n}")

tradedangerous/commands/commandenv.py

@@ -1,7 +1,8 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
-from .exceptions import CommandLineError, PadSizeError, PlanetaryError, FleetCarrierError
-from ..tradedb import AmbiguityError, System, Station
+from .exceptions import (
+    CommandLineError, FleetCarrierError, OdysseyError,
+    PadSizeError, PlanetaryError,
+)
+from ..tradedb import AmbiguityError, Station
 from ..tradeenv import TradeEnv
 
 import os
@@ -9,7 +10,7 @@ import pathlib
 import sys
 
 
-class CommandResults(object):
+class CommandResults:
     """
         Encapsulates the results returned by running a command.
     """
@@ -24,7 +25,7 @@ class CommandResults(object):
         cmdenv._cmd.render(self, cmdenv, tdb)
 
 
-class ResultRow(object):
+class ResultRow:
     
     def __init__(self, **kwargs):
         for k, v in kwargs.items():
@@ -46,7 +47,7 @@ class CommandEnv(TradeEnv):
         if self.detail and self.quiet:
             raise CommandLineError("'--detail' (-v) and '--quiet' (-q) are mutually exclusive.")
         
-        self._cmd = cmdModule or __main__
+        self._cmd = cmdModule or getattr("__main__")
         self.wantsTradeDB = getattr(cmdModule, 'wantsTradeDB', True)
         self.usesTradeData = getattr(cmdModule, 'usesTradeData', False)
         
@@ -187,7 +188,7 @@ class CommandEnv(TradeEnv):
             
             # But if it matched more than once, whine about ambiguity
             if item and place:
-                raise AmbiguityError('Avoidance', avoid, [ item, place.str() ])
+                raise AmbiguityError('Avoidance', avoid, [ item, place.text() ])
         
         self.DEBUG0("Avoiding items {}, places {}",
                     [ item.name() for item in avoidItems ],
@@ -213,7 +214,7 @@ class CommandEnv(TradeEnv):
             return
         self.padSize = padSize = padSize.upper()
         for value in padSize:
-            if not value in 'SML?':
+            if value not in 'SML?':
                 raise PadSizeError(padSize)
         self.padSize = padSize
     
@@ -227,7 +228,7 @@ class CommandEnv(TradeEnv):
             return
         self.planetary = planetary = planetary.upper()
         for value in planetary:
-            if not value in 'YN?':
+            if value not in 'YN?':
                 raise PlanetaryError(planetary)
         self.planetary = planetary
     
@@ -237,8 +238,8 @@ class CommandEnv(TradeEnv):
             return
         fleet = ''.join(sorted(list(set(fleet)))).upper()
         for value in fleet:
-            if not value in 'YN?':
-                raise FleetError(fleet)
+            if value not in 'YN?':
+                raise FleetCarrierError(fleet)
         if fleet == '?NY':
             self.fleet = None
             return
@@ -250,12 +251,12 @@ class CommandEnv(TradeEnv):
             return
         odyssey = ''.join(sorted(list(set(odyssey)))).upper()
         for value in odyssey:
-            if not value in 'YN?':
-                raise odysseyError(odyssey)
+            if value not in 'YN?':
+                raise OdysseyError(odyssey)
         if odyssey == '?NY':
             self.odyssey = None
             return
-        self.odyssey = odyssey = odyssey.upper()
+        self.odyssey = odyssey.upper()
     
     def colorize(self, color, rawText):
         """

tradedangerous/commands/exceptions.py

@@ -1,6 +1,5 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from ..tradeexcept import TradeException
-import sys
+
 
 ######################################################################
 # Exceptions
@@ -8,6 +7,7 @@ import sys
 class UsageError(TradeException):
     def __init__(self, title, usage):
         self.title, self.usage = title, usage
+
     def __str__(self):
         return self.title + "\n\n" + self.usage
 
@@ -20,6 +20,7 @@ class CommandLineError(TradeException):
     """
     def __init__(self, errorStr, usage=None):
         self.errorStr, self.usage = errorStr, usage
+ 
     def __str__(self):
         if self.usage:
             return "ERROR: {}\n\n{}".format(self.errorStr, self.usage)
@@ -35,8 +36,9 @@ class NoDataError(TradeException):
     """
     def __init__(self, errorStr):
         self.errorStr = errorStr
+
     def __str__(self):
-        return "Error: {}\n".format(self.errorStr) + ("""
+        return f"""Error: {self.errorStr}
 Possible causes:
 - No profitable runs or routes meet your criteria,
 - Missing Systems or Stations along the route (see "local -vv"),
@@ -47,7 +49,7 @@ project such as EDDBlink (https://github.com/eyeonus/EDDBlink).
 
 For more help, see the TradeDangerous Wiki:
     https://github.com/eyeonus/Trade-Dangerous/wiki
-""").format(sys.argv[0])
+"""
 
 
 class PadSizeError(CommandLineError):

tradedangerous/commands/export_cmd.py

@@ -1,7 +1,5 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
 from ..csvexport import exportTableToFile
-from .parsing import *
+from .parsing import ParseArgument, MutuallyExclusiveGroup
 from .exceptions import CommandLineError
 from pathlib import Path
 
@@ -122,4 +120,4 @@ def run(results, cmdenv, tdb):
             filePath.unlink()
             cmdenv.DEBUG0("Delete empty file {file}'".format(file=filePath))
     
-    return None
+    return None

tradedangerous/commands/import_cmd.py

@@ -1,13 +1,11 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
-from .exceptions import *
-from .parsing import *
+from .exceptions import CommandLineError
+from .parsing import ParseArgument, MutuallyExclusiveGroup
 from itertools import chain
 from pathlib import Path
 
 from .. import cache, plugins, transfers
-import math
 import re
+import sys
 
 try:
     import tkinter

tradedangerous/commands/local_cmd.py

@@ -1,12 +1,14 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from .commandenv import ResultRow
-from .parsing import *
+from .parsing import (
+    ParseArgument, PadSizeArgument, MutuallyExclusiveGroup, NoPlanetSwitch,
+    PlanetaryArgument, FleetCarrierArgument, OdysseyArgument, BlackMarketSwitch,
+    ShipyardSwitch, OutfittingSwitch, RearmSwitch, RefuelSwitch, RepairSwitch,
+)
 from ..formatting import RowFormat, ColumnFormat, max_len
 from itertools import chain
 from ..tradedb import TradeDB
 from ..tradeexcept import TradeException
 
-import math
 
 ######################################################################
 # Parser config
@@ -186,48 +188,37 @@ def render(results, cmdenv, tdb):
                         key=lambda row: row.age)
         ).append(
                 ColumnFormat("Mkt", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.market])
+                    key=lambda row: TradeDB.marketStates[row.station.market])
         ).append(
                 ColumnFormat("BMk", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.blackMarket])
+                    key=lambda row: TradeDB.marketStates[row.station.blackMarket])
         ).append(
                 ColumnFormat("Shp", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.shipyard])
+                    key=lambda row: TradeDB.marketStates[row.station.shipyard])
         ).append(
                 ColumnFormat("Out", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.outfitting])
+                    key=lambda row: TradeDB.marketStates[row.station.outfitting])
         ).append(
                 ColumnFormat("Arm", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.rearm])
+                    key=lambda row: TradeDB.marketStates[row.station.rearm])
         ).append(
                 ColumnFormat("Ref", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.refuel])
+                    key=lambda row: TradeDB.marketStates[row.station.refuel])
         ).append(
                 ColumnFormat("Rep", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.repair])
+                    key=lambda row: TradeDB.marketStates[row.station.repair])
         ).append(
                 ColumnFormat("Pad", '>', '3',
-                    key=lambda row: \
-                        TradeDB.padSizes[row.station.maxPadSize])
+                    key=lambda row: TradeDB.padSizes[row.station.maxPadSize])
         ).append(
                 ColumnFormat("Plt", '>', '3',
-                    key=lambda row: \
-                        TradeDB.planetStates[row.station.planetary])
+                    key=lambda row: TradeDB.planetStates[row.station.planetary])
         ).append(
                 ColumnFormat("Flc", '>', '3',
-                    key=lambda row: \
-                        TradeDB.fleetStates[row.station.fleet])
+                    key=lambda row: TradeDB.fleetStates[row.station.fleet])
         ).append(
                 ColumnFormat("Ody", '>', '3',
-                    key=lambda row: \
-                        TradeDB.odysseyStates[row.station.odyssey])
+                    key=lambda row: TradeDB.odysseyStates[row.station.odyssey])
         )
         if cmdenv.detail > 1:
             stnRowFmt.append(

tradedangerous/commands/market_cmd.py

@@ -1,9 +1,10 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from .commandenv import ResultRow
-from .exceptions import *
-from .parsing import *
-from ..formatting import RowFormat, ColumnFormat
-from ..tradedb import TradeDB
+from .exceptions import CommandLineError
+from .parsing import (
+    ParseArgument, MutuallyExclusiveGroup,
+)
+from ..formatting import RowFormat
+
 
 ######################################################################
 # Parser config
@@ -129,8 +130,8 @@ def render(results, cmdenv, tdb):
     if showCategories:
         rowFmt.prefix = '    '
     
-    sellPred = lambda row: row.sellCr != 0 and row.supply != '-'
-    buyPred = lambda row: row.buyCr != 0 and row.demand != '-'
+    sellPred = lambda row: row.sellCr != 0 and row.supply != '-'    # noqa: E731
+    buyPred = lambda row: row.buyCr != 0 and row.demand != '-'      # noqa: E731
     
     rowFmt.addColumn('Item', '<', longestLen,
             key=lambda row: row.item.name())
@@ -170,4 +171,4 @@ def render(results, cmdenv, tdb):
         if showCategories and row.item.category is not lastCat:
             print("+{}".format(row.item.category.name()))
             lastCat = row.item.category
-        print(rowFmt.format(row))
+        print(rowFmt.format(row))

tradedangerous/commands/nav_cmd.py

@@ -1,9 +1,12 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-from .parsing import *
-import math
+from .parsing import (
+    AvoidPlacesArgument, FleetCarrierArgument, MutuallyExclusiveGroup,
+    NoPlanetSwitch, OdysseyArgument, PadSizeArgument, ParseArgument,
+    PlanetaryArgument,
+)
 from ..tradedb import System, Station, TradeDB
 from ..tradeexcept import TradeException
 
+
 ######################################################################
 # Parser config
 
@@ -197,48 +200,37 @@ def render(results, cmdenv, tdb):
                         key=lambda row: row.age)
         ).append(
                 ColumnFormat('Mkt', '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.market])
+                    key=lambda row: TradeDB.marketStates[row.station.market])
         ).append(
                 ColumnFormat("BMk", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.blackMarket])
+                    key=lambda row: TradeDB.marketStates[row.station.blackMarket])
         ).append(
                 ColumnFormat("Shp", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.shipyard])
+                    key=lambda row: TradeDB.marketStates[row.station.shipyard])
         ).append(
                 ColumnFormat("Out", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.outfitting])
+                    key=lambda row: TradeDB.marketStates[row.station.outfitting])
         ).append(
                 ColumnFormat("Arm", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.rearm])
+                    key=lambda row: TradeDB.marketStates[row.station.rearm])
         ).append(
                 ColumnFormat("Ref", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.refuel])
+                    key=lambda row: TradeDB.marketStates[row.station.refuel])
         ).append(
                 ColumnFormat("Rep", '>', '3',
-                    key=lambda row: \
-                        TradeDB.marketStates[row.station.repair])
+                    key=lambda row: TradeDB.marketStates[row.station.repair])
         ).append(
                 ColumnFormat("Pad", '>', '3',
-                    key=lambda row: \
-                        TradeDB.padSizes[row.station.maxPadSize])
+                    key=lambda row: TradeDB.padSizes[row.station.maxPadSize])
         ).append(
                 ColumnFormat("Plt", '>', '3',
-                    key=lambda row: \
-                        TradeDB.planetStates[row.station.planetary])
+                    key=lambda row: TradeDB.planetStates[row.station.planetary])
         ).append(
                 ColumnFormat("Flc", '>', '3',
-                    key=lambda row: \
-                        TradeDB.fleetStates[row.station.fleet])
+                    key=lambda row: TradeDB.fleetStates[row.station.fleet])
         ).append(
                 ColumnFormat("Ody", '>', '3',
-                    key=lambda row: \
-                        TradeDB.odysseyStates[row.station.odyssey])
+                    key=lambda row: TradeDB.odysseyStates[row.station.odyssey])
         )
         if cmdenv.detail > 1:
             stnRowFmt.append(

tradedangerous/commands/olddata_cmd.py

@@ -1,11 +1,10 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-from .parsing import *
+from .parsing import (
+    FleetCarrierArgument, MutuallyExclusiveGroup, NoPlanetSwitch,
+    OdysseyArgument, ParseArgument, PadSizeArgument, PlanetaryArgument,
+)
 from ..tradedb import TradeDB
 from ..tradeexcept import TradeException
 
-import itertools
-import math
-import sys
 
 ######################################################################
 # Parser config
@@ -66,7 +65,6 @@ def run(results, cmdenv, tdb):
     
     cmdenv = results.cmdenv
     tdb = cmdenv.tdb
-    srcSystem = cmdenv.nearSystem
     
     results.summary = ResultRow()
     results.limit = cmdenv.limit
@@ -240,20 +238,16 @@ def render(results, cmdenv, tdb):
                         key=lambda row: row.station.distFromStar())
         ).append(
                 ColumnFormat("Pad", '>', '3',
-                        key=lambda row: \
-                            TradeDB.padSizes[row.station.maxPadSize])
+                        key=lambda row: TradeDB.padSizes[row.station.maxPadSize])
         ).append(
                 ColumnFormat("Plt", '>', '3',
-                        key=lambda row: \
-                            TradeDB.planetStates[row.station.planetary])
+                        key=lambda row: TradeDB.planetStates[row.station.planetary])
         ).append(
                 ColumnFormat("Flc", '>', '3',
-                        key=lambda row: \
-                            TradeDB.fleetStates[row.station.fleet])
+                        key=lambda row: TradeDB.fleetStates[row.station.fleet])
         ).append(
                 ColumnFormat("Ody", '>', '3',
-                        key=lambda row: \
-                            TradeDB.odysseyStates[row.station.odyssey])
+                        key=lambda row: TradeDB.odysseyStates[row.station.odyssey])
         )
     
     if not cmdenv.quiet:
@@ -261,4 +255,4 @@ def render(results, cmdenv, tdb):
         print(heading, underline, sep='\n')
     
     for row in results.rows:
-        print(rowFmt.format(row))
+        print(rowFmt.format(row))

tradedangerous/commands/parsing.py

@@ -1,10 +1,11 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-from .exceptions import PadSizeError, PlanetaryError, FleetCarrierError
+from .exceptions import (
+    FleetCarrierError, OdysseyError, PadSizeError, PlanetaryError,
+)
 
 ######################################################################
 # Parsing Helpers
 
-class ParseArgument(object):
+class ParseArgument:
     """
         Provides argument forwarding so that 'makeSubParser' can take function-like arguments.
     """
@@ -12,7 +13,7 @@ class ParseArgument(object):
         self.args, self.kwargs = args, kwargs
 
 
-class MutuallyExclusiveGroup(object):
+class MutuallyExclusiveGroup:
     def __init__(self, *args):
         self.arguments = list(args)
 
@@ -24,9 +25,10 @@ class MutuallyExclusiveGroup(object):
 class CreditParser(int):
     """
     argparse helper for parsing numeric prefixes, i.e.
-    'k' for thousand, 'm' for million and 'b' for billion.
+    'k' for thousands, 'm' for millions and 'b' for billions.
     """
     suffixes = {'k': 10**3, 'm': 10**6, 'b': 10**9}
+
     def __new__(cls, val, **kwargs):
         if isinstance(val, str):
             if val[-1] in CreditParser.suffixes:
@@ -82,7 +84,7 @@ class SwitchArgument(ParseArgument):
         else:
             self.args = (self.switches,)
         help = help or self.help
-        self.kwargs = {'action':'store_true', 'dest':self.dest, 'help':help}
+        self.kwargs = {'action': 'store_true', 'dest': self.dest, 'help': help}
 
 
 class BlackMarketSwitch(SwitchArgument):
@@ -209,6 +211,7 @@ class OdysseyArgument(int):
             'choices': 'YN?',
         }
 
+
 __tdParserHelpers = {
     'credits': CreditParser,
     'padsize': PadSizeArgument.PadSizeParser,

tradedangerous/commands/rares_cmd.py

@@ -1,11 +1,12 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from .commandenv import ResultRow
-from .exceptions import *
-from .parsing import *
-from ..formatting import RowFormat, ColumnFormat, max_len
+from .exceptions import CommandLineError
+from .parsing import (
+    PadSizeArgument, ParseArgument, MutuallyExclusiveGroup, NoPlanetSwitch,
+    PlanetaryArgument, FleetCarrierArgument, OdysseyArgument,
+)
+from ..formatting import RowFormat, max_len
 from ..tradedb import TradeDB
 
-import math
 
 ######################################################################
 # Parser config
@@ -61,8 +62,7 @@ switches = [
             default=False,
     ),
     ParseArgument('--away',
-            help='Require "--from" systems to be at least this far ' \
-                    'from primary system',
+            help='Require "--from" systems to be at least this far from primary system',
             metavar='LY',
             default=0,
             type=float,
@@ -78,8 +78,7 @@ switches = [
         )
     ),
     ParseArgument('--from',
-            help='Additional systems to range check candidates against, ' \
-                    'requires --away.',
+            help='Additional systems to range check candidates against, requires --away.',
             metavar='SYSTEMNAME',
             action='append',
             dest='awayFrom',
@@ -165,7 +164,7 @@ def run(results, cmdenv, tdb):
     
     # Look through the rares list.
     for rare in tdb.rareItemByID.values():
-        if not rare.illegal in wantIllegality:
+        if rare.illegal not in wantIllegality:
             continue
         if padSize:       # do we care about pad size?
             if not rare.station.checkPadSize(padSize):