* Mark integration tests as flaky.

* pep8.

* Remove old compat code.

* Add __future__ imports.

* Remove outdated test.

* Check if unicode instead of string_t.

* Actually text_t is better.

* Remove import for sys as it is no longer used.

* Testing: Replace @patch decorators

The @patch decorator clashes with py.test's fixture support because py.test
tries to interpret the argument names as fixtures and doesn't know about
@patch filling the slots.

Rather than performing deep hackery, teaching either of these tools to work
that way, this patch elects to simply replace these decorators with
"with patch() …" constructs.

* fix flake8 errors

including two that were not my fault ;-)

* ensure that all call sites for decoding bytes to str allow surrogates, as the encoding mechanism now supports

* tests <3

* fix tests

* test updates

* thinking maybe this dependency is out of date

* revert