Make six use consistant.
Review Request #9649 — Created Feb. 16, 2018 and submitted — Latest diff uploaded
Make six use consistant.
Import the function directly if it is a six.moves function otherwise
leave it specified as a six function that needs to be replaced in
the future.
All tests passed in python 2.7