Skip to content

Fix SubStream to respect IOBase protocol #7843

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.

Sign up for GitHub

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

Merged
lmazuel merged 1 commit into from
Oct 11, 2019
Merged

Fix SubStream to respect IOBase protocol #7843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions sdk/storage/azure-storage-blob/azure/storage/blob/_shared/uploads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,22 +394,25 @@ def fileno(self):
def flush(self):
pass

def read(self, n):
def read(self, size=None):
if self.closed:
raise ValueError("Stream is closed.")

if size is None:
size = self._length - self._position

# adjust if out of bounds
if n + self._position >= self._length:
n = self._length - self._position
if size + self._position >= self._length:
size = self._length - self._position

# return fast
if n == 0 or self._buffer.closed:
if size == 0 or self._buffer.closed:
return b""

# attempt first read from the read buffer and update position
read_buffer = self._buffer.read(n)
read_buffer = self._buffer.read(size)
bytes_read = len(read_buffer)
bytes_remaining = n - bytes_read
bytes_remaining = size - bytes_read
self._position += bytes_read

# repopulate the read buffer from the underlying stream to fulfill the request
Expand Down
15 changes: 9 additions & 6 deletions sdk/storage/azure-storage-file/azure/storage/file/_shared/uploads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,22 +394,25 @@ def fileno(self):
def flush(self):
pass

def read(self, n):
def read(self, size=None):
if self.closed:
raise ValueError("Stream is closed.")

if size is None:
size = self._length - self._position

# adjust if out of bounds
if n + self._position >= self._length:
n = self._length - self._position
if size + self._position >= self._length:
size = self._length - self._position

# return fast
if n == 0 or self._buffer.closed:
if size == 0 or self._buffer.closed:
return b""

# attempt first read from the read buffer and update position
read_buffer = self._buffer.read(n)
read_buffer = self._buffer.read(size)
bytes_read = len(read_buffer)
bytes_remaining = n - bytes_read
bytes_remaining = size - bytes_read
self._position += bytes_read

# repopulate the read buffer from the underlying stream to fulfill the request
Expand Down
15 changes: 9 additions & 6 deletions sdk/storage/azure-storage-queue/azure/storage/queue/_shared/uploads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,22 +394,25 @@ def fileno(self):
def flush(self):
pass

def read(self, n):
def read(self, size=None):
if self.closed:
raise ValueError("Stream is closed.")

if size is None:
size = self._length - self._position

# adjust if out of bounds
if n + self._position >= self._length:
n = self._length - self._position
if size + self._position >= self._length:
size = self._length - self._position

# return fast
if n == 0 or self._buffer.closed:
if size == 0 or self._buffer.closed:
return b""

# attempt first read from the read buffer and update position
read_buffer = self._buffer.read(n)
read_buffer = self._buffer.read(size)
bytes_read = len(read_buffer)
bytes_remaining = n - bytes_read
bytes_remaining = size - bytes_read
self._position += bytes_read

# repopulate the read buffer from the underlying stream to fulfill the request
Expand Down