Sort out two deprecation warnings to help silence the test suite.
With the Python 2 deadline gone, it's time to move with the times and switch to Python 3 only.
* Handle unicode strings when recording responses (#1253) * Add new test requirements * Make requirement conditional * Fix flake8 error * Compare dict values without worrying about key order * Improve readability