Hey Frood,  I'll take another look at it tomorrow when I am less addled.  But as to context managers that are actual classes - I've not written a single one;  they are always generator functions with a simple try/yield/except/finally in the body.  After all state-is-state, and writing an __init__, __enter__, and __exit__ is just extra boilerplate for my common uses.