six: py3compat imports BytesIO and StringIO from six
six: query.py: headers
six: query.py: imports fixed
six: query.py: unicode --> text_type
six: query.py: __nonzero__ --> __bool__ handling
six: query.py done