Simply import pickle as there is no need to import pickle as pickle.

Signed-off-by: David Black <dblack@atlassian.com>
Remove the redundant parenthesis added by the 2to3 script.

Signed-off-by: David Black <dblack@atlassian.com>
isinstance(thing, six.string_types) looks nicer than isinstance(thing, six.string_types[0]).

Signed-off-by: David Black <dblack@atlassian.com>
Do isinstance(self.data, six.text_type) instead of isinstance(self.data, type(six.text_type())).

Signed-off-by: David Black <dblack@atlassian.com>
Switch out six.next(...) for next(...).

Signed-off-by: David Black <dblack@atlassian.com>
Merge branch 'python_3_support' into minor_code_fixup