Committed.  FYI, I did have to make a few tweaks.  There were several lines longer than 80 characters still that I wrapped.  The tests failed with -W error:BytesWarning, something I normally run the tests with.  That required a fix to the library (a decode on the error message...if anyone is depending on the error message being bytes instead of string I'm sorry, but I doubt anyone is.  And finally, committing to 3.6 required adding the 'r' prefix to some of the tests regexes to eliminate the invalid escape warnings.

Thanks for your patience and persistence, Maciej.