Make variables command only show user-defined variables #10
Conversation
Previously the 'variables' command showed all known variables, which made it hard for the user to find the ones created during the session. Make the 'variables' command instead only show the variables created by the user, either through "var=value" or "value 'var' store" during the current session. Rename the old variables command to 'variables_all'.
|
Oh boy.... I only just found this, in my spam folder :-(. Sorry! If I don't respond to things, please feel free to email me at [email protected] |
| @@ -546,6 +547,7 @@ def _tryEvalExec(self, command, modifiers, count): | |||
| value = EngNumber(command) | |||
| except decimal.InvalidOperation: | |||
| try: | |||
| variables_before = set(self._variables.keys()) | |||
There was a problem hiding this comment.
You don't need the .keys() here. The dict is being iterated, so you get the keys as a result.
Also, could you use camelCase? I know it's a tiny/silly issue, but I'd prefer to keep the code consistent in that respect. Sorry!
| @@ -561,6 +563,13 @@ def _tryEvalExec(self, command, modifiers, count): | |||
| 'whitespace in a command line?') | |||
| raise CalculatorError(*errors) | |||
| else: | |||
| # If we have new variables, add them to the user variables | |||
| # list | |||
| variables_after = set(self._variables.keys()) | |||
| variables_after = set(self._variables.keys()) | ||
| new_variables = variables_after.difference(variables_before) | ||
| for var in new_variables: | ||
| self._userVariables.append(var) |
There was a problem hiding this comment.
Why are the user variables a list and not a set? Does that mean that a variable could end up in self._userVariables twice? If you really want it to be a list you can replace these two lines with self._userVariables.extend(new_variables).
| @param count: An C{int} count of the number of arguments to pass. | ||
| """ | ||
| for name, value in sorted(calc._variables.items()): | ||
| if name in calc._userVariables: |
There was a problem hiding this comment.
It seems like self._userVariables should be a set.
Hey, don't worry about it! I was going to email you after I helped on #9 , to clear the way for this PR, I just didn't find the time for it yet :). |
Previously the 'variables' command showed all known variables, which
made it hard for the user to find the ones created during the session.
Make the 'variables' command instead only show the variables created by
the user, either through "var=value" or "value 'var' store" during the
current session.
Rename the old variables command to 'variables_all'.
This is being done on top of the 'reverse-reverse-8' branch in order to avoid having to change the test after that branch is merged.