cleanup (remove comments; pep8/pylint)

Author: dwhswenson

paths_cli/wizard/load_from_ops.py

@@ -1,12 +1,10 @@
 from paths_cli.parameters import INPUT_FILE
 from paths_cli.wizard.core import get_object
-from paths_cli.wizard.standard_categories import CATEGORIES
-from paths_cli.wizard.helper import Helper
-from functools import partial
 
 from paths_cli.wizard.errors import FILE_LOADING_ERROR_MSG
 LABEL = "Load existing from OPS file"
 
+
 def named_objs_helper(storage, store_name):
     def list_items(user_input, context=None):
         store = getattr(storage, store_name)
@@ -25,13 +23,13 @@ def _get_ops_storage(wizard):
         storage = INPUT_FILE.get(filename)
     except Exception as e:
         wizard.exception(FILE_LOADING_ERROR_MSG, e)
-        return
+        return None
 
     return storage
 
+
 @get_object
 def _get_ops_object(wizard, storage, store_name, obj_name):
-    # TODO: switch this to using wizard.ask_enumerate_dict, I think
     store = getattr(storage, store_name)
     options = {obj.name: obj for obj in store if obj.is_named}
     result = wizard.ask_enumerate_dict(
@@ -40,6 +38,7 @@ def _get_ops_object(wizard, storage, store_name, obj_name):
     )
     return result
 
+
 def load_from_ops(wizard, store_name, obj_name):
     wizard.say("Okay, we'll load it from an OPS file.")
     storage = _get_ops_storage(wizard)

paths_cli/wizard/volumes.py

@@ -1,4 +1,5 @@
 import operator
+from functools import partial
 from paths_cli.wizard.parameters import ProxyParameter
 from paths_cli.wizard.plugin_classes import (
     LoadFromOPS, WizardParameterObjectPlugin, WizardObjectPlugin,
@@ -7,7 +8,7 @@
 from paths_cli.wizard.helper import EvalHelperFunc, Helper
 from paths_cli.wizard.core import interpret_req
 import paths_cli.compiling.volumes
-from functools import partial
+
 
 def _binary_func_volume(wizard, context, op):
     wizard.say("Let's make the first constituent volume:")
@@ -28,6 +29,7 @@ def _binary_func_volume(wizard, context, op):
 _LAMBDA_STR = ("What is the {minmax} allowed value for "
                "'{{obj_dict[cv].name}}' in this volume?")
 
+
 CV_DEFINED_VOLUME_PLUGIN = WizardParameterObjectPlugin.from_proxies(
     name="CV-defined volume (allowed values of CV)",
     category="volume",
@@ -57,6 +59,7 @@ def _binary_func_volume(wizard, context, op):
     compiler_plugin=paths_cli.compiling.volumes.CV_VOLUME_PLUGIN,
 )
 
+
 INTERSECTION_VOLUME_PLUGIN = WizardObjectPlugin(
     name='Intersection of two volumes (must be in both)',
     category="volume",
@@ -69,6 +72,7 @@ def _binary_func_volume(wizard, context, op):
                  "both of the volumes that define it."),
 )
 
+
 UNION_VOLUME_PLUGIN = WizardObjectPlugin(
     name='Union of two volumes (must be in at least one)',
     category="volume",
@@ -81,6 +85,7 @@ def _binary_func_volume(wizard, context, op):
                  "that define this are also in this volume"),
 )
 
+
 NEGATED_VOLUME_PLUGIN = WizardObjectPlugin(
     name='Complement of a volume (not in given volume)',
     category='volume',
@@ -93,13 +98,15 @@ def _binary_func_volume(wizard, context, op):
                  "in the existing volume."),
 )
 
+
 _FIRST_STATE = ("Now  let's define state states for your system. "
                 "You'll need to define {n_states_string} of them.")
 _ADDITIONAL_STATES = "Okay, let's define another stable state."
 _VOL_DESC = ("You can describe this as either a range of values for some "
              "CV, or as some combination of other such volumes "
              "(i.e., intersection or union).")
 
+
 def volume_intro(wizard, context):
     as_state = context.get('depth', 0) == 0
     n_states = len(wizard.states)
@@ -114,18 +121,21 @@ def volume_intro(wizard, context):
     intro += [_VOL_DESC]
     return intro
 
+
 def volume_set_context(wizard, context, selected):
     depth = context.get('depth', 0) + 1
     new_context = {
         'depth': depth,
     }
     return new_context
 
+
 def volume_ask(wizard, context):
     as_state = context.get('depth', 0) == 0
     obj = {True: 'state', False: 'volume'}[as_state]
     return f"What describes this {obj}?"
 
+
 VOLUME_FROM_FILE = LoadFromOPS('volume')
 
 VOLUMES_PLUGIN = WrapCategory(