From e5910b93ac6cbeb26b404f0afd0f865f89e3871d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 22 Apr 2023 09:52:26 +0000 Subject: [PATCH] uploads: Rename uploader to owner This would be more consistent with other objects. Signed-off-by: Michael Tremer --- src/buildservice/uploads.py | 10 +++++----- src/web/uploads.py | 2 +- tests/upload.py | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/buildservice/uploads.py b/src/buildservice/uploads.py index 436de66..b873652 100644 --- a/src/buildservice/uploads.py +++ b/src/buildservice/uploads.py @@ -50,15 +50,15 @@ class Uploads(base.Object): """, uuid, ) - def create(self, filename, size, uploader=None): + def create(self, filename, size, owner=None): builder = None user = None # Check uploader type - if isinstance(uploader, builders.Builder): - builder = uploader - elif isinstance(uploader, users.User): - user = uploader + if isinstance(owner, builders.Builder): + builder = owner + elif isinstance(owner, users.User): + user = owner # Check quota for users if user: diff --git a/src/web/uploads.py b/src/web/uploads.py index 20b4399..0b15a6b 100644 --- a/src/web/uploads.py +++ b/src/web/uploads.py @@ -85,7 +85,7 @@ class APIv1IndexHandler(base.APIMixin, tornado.web.RequestHandler): upload = self.backend.uploads.create( filename, size=size, - uploader=self.current_user, + owner=self.current_user, ) except users.QuotaExceededError as e: diff --git a/tests/upload.py b/tests/upload.py index 80d38b4..cd772f0 100755 --- a/tests/upload.py +++ b/tests/upload.py @@ -18,7 +18,7 @@ class UploadTestCase(test.TestCase): Tests whether uploads can be created and deleted """ # Create the upload object - upload = self.backend.uploads.create("test.blob", size=0, user=self.user) + upload = self.backend.uploads.create("test.blob", size=0, owner=self.user) self.assertIsInstance(upload, uploads.Upload) self.assertEqual(upload.filename, "test.blob") @@ -39,7 +39,7 @@ class UploadTestCase(test.TestCase): payload = io.BytesIO(b"012345678901234567890123456789") with self.db.transaction(): - upload = self.backend.uploads.create("test.blob", size=20, user=self.user) + upload = self.backend.uploads.create("test.blob", size=20, owner=self.user) # Try to write more than 20 bytes with self.assertRaises(OverflowError): @@ -52,7 +52,7 @@ class UploadTestCase(test.TestCase): payload = io.BytesIO(b"01234567890123456789") with self.db.transaction(): - upload = self.backend.uploads.create("test.blob", size=20, user=self.user) + upload = self.backend.uploads.create("test.blob", size=20, owner=self.user) # Write some payload await upload.copyfrom(payload) @@ -73,7 +73,7 @@ class UploadTestCase(test.TestCase): self.backend.uploads.create( "test.blob", size=209715200, - user=self.user, + owner=self.user, ) -- 2.39.2