Use TensorFlow idiom for importing six.moves.xrange.

PiperOrigin-RevId: 163261434

Author: T2T Team

tensor2tensor/data_generators/text_encoder.py

@@ -30,12 +30,11 @@
 # Dependency imports
 
 import six
+from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensor2tensor.data_generators import tokenizer
 
 import tensorflow as tf
 
-xrange = six.moves.xrange  # pylint: disable=redefined-builtin
-
 # Reserved tokens for things like padding and EOS symbols.
 PAD = "<pad>"
 EOS = "<EOS>"

tensor2tensor/data_generators/tokenizer.py

@@ -51,10 +51,9 @@
 # Dependency imports
 
 import six
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
-xrange = six.moves.xrange  # pylint: disable=redefined-builtin
-
 # Conversion between Unicode and UTF-8, if required (on Python2)
 _native_to_unicode = (lambda s: s.decode("utf-8")) if six.PY2 else (lambda s: s)
 

tensor2tensor/data_generators/tokenizer_test.py

@@ -26,11 +26,10 @@
 # Dependency imports
 
 import six
+from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensor2tensor.data_generators import tokenizer
 import tensorflow as tf
 
-xrange = six.moves.xrange  # pylint: disable=redefined-builtin
-
 FLAGS = tf.app.flags.FLAGS
 
 _TESTDATA = "google3/third_party/py/tensor2tensor/data_generators/test_data"