Remove most use of literal lists of simulators. #200
Conversation
could exist, and support for producing the list of simulators. Use this in place of hardcoded lists of simulators.
Codecov Report
@@ Coverage Diff @@
## develop #200 +/- ##
===========================================
+ Coverage 81.57% 81.66% +0.08%
===========================================
Files 38 39 +1
Lines 2709 2722 +13
Branches 342 344 +2
===========================================
+ Hits 2210 2223 +13
Misses 392 392
Partials 107 107
Continue to review full report at Codecov.
|
pocs/hardware.py
Outdated
| ALL_NAMES = sorted(['camera', 'dome', 'mount', 'night', 'weather']) | ||
|
|
||
|
|
||
| def GetAllNames(all_names=ALL_NAMES, without=None): |
pocs/hardware.py
Outdated
| def GetAllNames(all_names=ALL_NAMES, without=None): | ||
| """ | ||
| """ | ||
| if without: |
There was a problem hiding this comment.
If you change the default to be without=list() then you don't need to check for the if and you can just do the one line return statement.
pocs/hardware.py
Outdated
| return list(all_names) | ||
|
|
||
|
|
||
| def GetSimulatorNames(simulator=None, kwargs=None, config=None): |
pocs/hardware.py
Outdated
| Or: | ||
| GetSimulatorNames(simulator=simulator, config=self.config) | ||
|
|
||
| The reason this function doesn't just take **kwargs as its sole arg is that we need to allow |
There was a problem hiding this comment.
I don't doubt this is true but seems odd.
There was a problem hiding this comment.
Annoying but true.
pocs/hardware.py
Outdated
| List of names of the hardware to be simulated. | ||
| """ | ||
| def ExtractSimulator(d): | ||
| if d: |
There was a problem hiding this comment.
I keep meaning to mention this in other places, but the more pythonic way (EAFP) would be to:
try:
return d['simulator']
except KeyError:
return None
There was a problem hiding this comment.
I decided on yet another approach.
pocs/hardware.py
Outdated
| if d: | ||
| return d.get('simulator') | ||
| return None | ||
| for simulator in [simulator, ExtractSimulator(kwargs), ExtractSimulator(config)]: |
There was a problem hiding this comment.
Fixed... and what a stupid idea! Clearly a sign that I added the simulator kwarg after deciding that the for loop variable would be called simulator.
pocs/hardware.py
Outdated
| Returns: | ||
| List of names of the hardware to be simulated. | ||
| """ | ||
| def ExtractSimulator(d): |
Add pocs/hardware.py, with info about all the types of hardware that could exist, and support for producing the list of simulators. Use this in place of hardcoded lists of simulators.
Supports #134 and #199, but does not fix either one.