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.

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

cleanup: avoid redefinition of object #601

Merged
merged 2 commits into from
Feb 26, 2024
Merged

cleanup: avoid redefinition of object #601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35b8ebb
cleanup: avoid redefinition of `object`
coryan Feb 25, 2024
7647a71
Fix formatting
coryan Feb 25, 2024
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
5 changes: 2 additions & 3 deletions gcs/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
import flask
from google.protobuf import json_format

import gcs
import testbench
from google.storage.v2 import storage_pb2

from . import object


class Upload(types.SimpleNamespace):
"""Holds data during an upload.
Expand Down Expand Up @@ -392,7 +391,7 @@ def process_bidi_write_object_grpc(cls, db, request_iterator, context):

# Create a new object when the write is completed.
if upload.complete:
blob, _ = object.Object.init(
blob, _ = gcs.object.Object.init(
upload.request,
upload.metadata,
upload.media,
Expand Down