Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove property from seekable method of FileIO #28006

Merged
merged 4 commits into from Apr 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion tensorflow/python/lib/io/file_io.py
Expand Up @@ -241,7 +241,6 @@ def close(self):
pywrap_tensorflow.Set_TF_Status_from_Status(status, ret_status)
self._writable_file = None

@property
def seekable(self):
"""Returns True as FileIO supports random access ops of seek()/tell()"""
return True
Expand Down
9 changes: 9 additions & 0 deletions tensorflow/python/lib/io/file_io_test.py
Expand Up @@ -20,9 +20,11 @@
from __future__ import print_function

import os.path
import numpy as np

from tensorflow.python.framework import errors
from tensorflow.python.lib.io import file_io
from tensorflow.python.platform import gfile
from tensorflow.python.platform import test


Expand Down Expand Up @@ -606,6 +608,13 @@ def testMatchingFilesPermission(self):
# Change noread back so that it could be cleaned during tearDown.
os.chmod(noread_path, 0o777)

def testFileSeekableWithZip(self):
# Note: Test case for GitHub issue 27276, issue only exposed in python 3.7+.
filename = os.path.join(self._base_dir, "a.npz")
np.savez_compressed(filename, {"a": 1, "b": 2})
with gfile.GFile(filename, "rb") as f:
info = np.load(f)
_ = [i for i in info.items()]

if __name__ == "__main__":
test.main()
Expand Up @@ -11,10 +11,6 @@ tf_class {
name: "name"
mtype: "<type \'property\'>"
}
member {
name: "seekable"
mtype: "<type \'property\'>"
}
member_method {
name: "__init__"
argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
Expand Down Expand Up @@ -47,6 +43,10 @@ tf_class {
name: "seek"
argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
}
member_method {
name: "seekable"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "size"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
Expand Down
8 changes: 4 additions & 4 deletions tensorflow/tools/api/golden/v1/tensorflow.gfile.-g-file.pbtxt
Expand Up @@ -11,10 +11,6 @@ tf_class {
name: "name"
mtype: "<type \'property\'>"
}
member {
name: "seekable"
mtype: "<type \'property\'>"
}
member_method {
name: "__init__"
argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
Expand Down Expand Up @@ -47,6 +43,10 @@ tf_class {
name: "seek"
argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
}
member_method {
name: "seekable"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "size"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
Expand Down
8 changes: 4 additions & 4 deletions tensorflow/tools/api/golden/v1/tensorflow.gfile.-open.pbtxt
Expand Up @@ -11,10 +11,6 @@ tf_class {
name: "name"
mtype: "<type \'property\'>"
}
member {
name: "seekable"
mtype: "<type \'property\'>"
}
member_method {
name: "__init__"
argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
Expand Down Expand Up @@ -47,6 +43,10 @@ tf_class {
name: "seek"
argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
}
member_method {
name: "seekable"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "size"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
Expand Down
Expand Up @@ -11,10 +11,6 @@ tf_class {
name: "name"
mtype: "<type \'property\'>"
}
member {
name: "seekable"
mtype: "<type \'property\'>"
}
member_method {
name: "__init__"
argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
Expand Down Expand Up @@ -47,6 +43,10 @@ tf_class {
name: "seek"
argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
}
member_method {
name: "seekable"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "size"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
Expand Down
Expand Up @@ -11,10 +11,6 @@ tf_class {
name: "name"
mtype: "<type \'property\'>"
}
member {
name: "seekable"
mtype: "<type \'property\'>"
}
member_method {
name: "__init__"
argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
Expand Down Expand Up @@ -47,6 +43,10 @@ tf_class {
name: "seek"
argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
}
member_method {
name: "seekable"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "size"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
Expand Down