Avoid KeyError on variable reuse #64
Conversation
| @@ -30,5 +30,6 @@ def __call__(self, match): | |||
| # of the line just after the last non-whitespace character | |||
| # e.g. blah=\n --> blah=text\n | |||
| start = end = len(original.rstrip()) | |||
| self.missing.remove(key) | |||
| if key in self.missing: | |||
| self.missing.remove(key) | |||
| [AutoVersionConfig] | ||
| CONFIG_NAME = 'example' | ||
| PRERELEASE_TOKEN = 'dev' | ||
| targets = ["example.py", "example2.py"] |
There was a problem hiding this comment.
The only difference to example.toml: two targets
| @@ -0,0 +1,6 @@ | |||
| LOCK = False | |||
| RELEASE = True | |||
| VERSION = "19.99.0" | |||
There was a problem hiding this comment.
Literally the same file as example.py - we just need to hit at least one variable that was already substituted elsewhere.
|
A more elaborated approach would be to key the variables by file, so that variables with the same name, but in different files would be handled as separate substitutions; that would change the user-facing API though, so I opted for a simpler solution. |
| @@ -1,2 +1,3 @@ | |||
| toml | |||
| semver~=2.13 | |||
| six | |||
There was a problem hiding this comment.
I'm slightly confused with this one: you clearly use six in the sources; still, it's not in the requirements.txt. Maybe I'm just missing some pythonesque feature, please forgive me then, I'm happy to revert.
| with open("example2.py", "r") as f: | ||
| second_file = f.read() | ||
| self.assertEqual(second_file, '''LOCK = False | ||
| RELEASE = True |
There was a problem hiding this comment.
Would I readlines(), the assert would look less ugly; but then my python was glueing up two lines together, faithfully keeping \n in the middle, and I decided that the life's too short.
|
@alf239 Thank you for your contribution. Your change has now been integrated and released onto PyPI. |
When there are multiple files in target, and they happen to share a version variable, it is only replaced in the first file in the list, as
ReplacementHandlerthrowsKeyErrortrying to remove the field from themissinglist.