Make changes based on carljm's feedback

- Use Django's bundled six
- Fix Python 3 incompatible except clause