Index: app/models/package.py |
diff --git a/app/models/package.py b/app/models/package.py |
index c14c4824040c89ca4d13f90be1cfc9d96abddb72..5a1060fdd747fc977ea13624905b528ada591d56 100644 |
--- a/app/models/package.py |
+++ b/app/models/package.py |
@@ -28,12 +28,7 @@ class Package(db.Model): |
MAX_SIZE = 10 * 2**20 # 10MB |
"""The maximum package size, in bytes.""" |
- uploaders = db.ListProperty(users.User, validator=models.validate_not_empty) |
- """The users who are allowed to upload new versions of the package. |
- |
- When this is set, invalidate_cache() must be called.""" |
- |
- uploaderEmails = db.StringListProperty() |
+ uploaderEmails = db.StringListProperty(validator=models.validate_not_empty) |
"""The user emails who are allowed to upload new versions of the package. |
When this is set, invalidate_cache() must be called.""" |
@@ -54,15 +49,6 @@ class Package(db.Model): |
When this is set, invalidate_cache() must be called.""" |
- def temp_synchronize_uploaders_to_uploaderemails(self): |
- """ Will synchronize self.uploaders -> self.uploaderEmails. """ |
- if self.uploaders is None: |
- self.uploaderEmails = None |
- elif len(self.uploaders) == 0: |
- self.uploaderEmails = self.uploaders |
- else: |
- self.uploaderEmails = [uploader.email() for uploader in self.uploaders] |
- |
@property |
def description(self): |
"""The short description of the package.""" |
@@ -173,7 +159,7 @@ class Package(db.Model): |
self.name, str(version)) |
return version is not None |
- def has_uploader(self, uploader): |
+ def has_uploader_email(self, uploaderEmail): |
"""Determine whether the given user is an uploader for this package. |
This compares users via case-insensitive email comparison. |
@@ -181,7 +167,7 @@ class Package(db.Model): |
Although admins have uploader privileges for all packages, this will not |
return True for admins. |
""" |
- return uploader.email().lower() in \ |
+ return uploaderEmail.lower() in \ |
[email.lower() for email in self.uploaderEmails] |
@property |