experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove legacy unicode() support in Keras.

Browse Source 
PiperOrigin-RevId: 333447364
Change-Id: I33c1298f5dd7dcdd2cb6468d92162c7bb2cb1cf7
This commit is contained in:
A. Unique TensorFlower 2020-09-23 22:40:53 -07:00 committed by TensorFlower Gardener
parent 5ce0fe025a
commit 45a2235d04
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/python/keras/callbacks.py
View File

@ -2566,6 +2566,8 @@ class CSVLogger(Callback):
delimiter = self.sep delimiter = self.sep
fieldnames = ['epoch'] + self.keys fieldnames = ['epoch'] + self.keys
if six.PY2:
fieldnames = [unicode(x) for x in fieldnames]
self.writer = csv.DictWriter( self.writer = csv.DictWriter(
self.csv_file, self.csv_file,

9
tensorflow/python/keras/engine/data_adapter.py
View File

@ -61,6 +61,13 @@ try:
except ImportError: except ImportError:
pd = None pd = None
try:
# In Python2 unicode is a scalar type
scalar_types = (float, int, str, unicode)
except NameError:
# In Python3 unicode is not present, it always uses string
scalar_types = (float, int, str)
@six.add_metaclass(abc.ABCMeta) @six.add_metaclass(abc.ABCMeta)
class DataAdapter(object): class DataAdapter(object):
@ -610,7 +617,7 @@ class ListsOfScalarsDataAdapter(DataAdapter):
@staticmethod @staticmethod
def _is_list_of_scalars(inp): def _is_list_of_scalars(inp):
if isinstance(inp, (float, int, str)): if isinstance(inp, scalar_types):
return True return True
if isinstance(inp, (list, tuple)): if isinstance(inp, (list, tuple)):
return ListsOfScalarsDataAdapter._is_list_of_scalars(inp[0]) return ListsOfScalarsDataAdapter._is_list_of_scalars(inp[0])