TensorFlow: Upstream changes to git

Changes:
- Updates to docs
- Several changes for Python 3 compatibility
- Added license headers

Base CL: 108710566

1 files changed, 5 insertions, 5 deletions

diff --git a/tensorflow/python/ops/constant_op.py b/tensorflow/python/ops/constant_op.py
index 9cf5e99a1e..f2aaad37a9 100644
--- a/tensorflow/python/ops/constant_op.py
+++ b/tensorflow/python/ops/constant_op.py
@@ -105,10 +105,10 @@ import tensorflow.python.platform
 import numpy as np
 
 from tensorflow.core.framework import attr_value_pb2
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
-from tensorflow.python.framework import types
 
 
 def constant(value, dtype=None, shape=None, name="Const"):
@@ -182,10 +182,10 @@ def _tensor_shape_tensor_conversion_function(s, dtype=None, name=None):
     raise ValueError(
         "Cannot convert a partially known TensorShape to a Tensor: %s" % s)
   if dtype is not None:
-    if dtype not in (types.int32, types.int64):
+    if dtype not in (dtypes.int32, dtypes.int64):
       raise TypeError("Cannot convert a TensorShape to dtype: %s" % dtype)
   else:
-    dtype = types.int32
+    dtype = dtypes.int32
   if name is None:
     name = "shape_as_tensor"
   return constant(s.as_list(), dtype=dtype, name=name)
@@ -197,10 +197,10 @@ def _dimension_tensor_conversion_function(d, dtype=None, name=None):
   if d.value is None:
     raise ValueError("Cannot convert an unknown Dimension to a Tensor: %s" % d)
   if dtype is not None:
-    if dtype not in (types.int32, types.int64):
+    if dtype not in (dtypes.int32, dtypes.int64):
       raise TypeError("Cannot convert a TensorShape to dtype: %s" % dtype)
   else:
-    dtype = types.int32
+    dtype = dtypes.int32
   if name is None:
     name = "shape_as_tensor"
   return constant(d.value, dtype=dtype, name=name)