Make sure that initial state gets reset if anything goes wrong in rc_context [backport to 1.4.x]
#3752
Conversation
…e if an exception happened while setting new rc parameters inside rc_context.
| rcParams.update(self.rcdict) | ||
| except: | ||
| # if anything goes wrong, revert rc parameters and re-raise | ||
| rcParams.update(self._rcparams) |
There was a problem hiding this comment.
Technically speaking, wouldn't this still leave new entries in the dictionary? Of course, this might not matter if the set of entries is always the same. Still I would have hoped that there would be a context manager for something like this already. If there isn't, it feels like a hole in the standard library.
There was a problem hiding this comment.
@WeatherGod - ah yes, good catch, I've updated this to add a call to clear before the update, which I think will do the right thing.
|
@WeatherGod - I've implemented your suggestions |
| try: | ||
| from collections import OrderedDict | ||
| except ImportError: | ||
| return # can't run this test on Python 2.6 |
There was a problem hiding this comment.
This is a tad picky, can you raise a skip here and do it by testing the version of python? There are a couple of other tests in this file that do the same thing.
There was a problem hiding this comment.
I'm fine with picky :) I pushed a new change.
rc_contextrc_context [backport to 1.4.x]
BUG : Make sure that initial state gets reset if anything goes wrong in ``rc_context``
BUG : Make sure that initial state gets reset if anything goes wrong in ``rc_context``
|
Cherry-picked as 001b1e9 |
Fixed a bug that caused rc parameters to not be reset to initial state if an exception happened while setting new rc parameters inside rc_context. This matters because I use
rc_contextis a testing suite and one of my tests may wantrc_contextto fail, but then the rcparams are left in a modified state for future tests. I have included a regression test.Unfortunately I have to use an ordered dict otherwise the failure is not deterministic (because it depends on the order in which the rcparams are set) so if ordered dict can't import I simply pass the test (I wasn't sure if you make use of the skipping plugin).