Use uploaderEmails instead of uploaders

app/models/package.py

 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import cgi
 import json
 import logging
 
 from google.appengine.api import memcache
 from google.appengine.api import users
@@ skipping 110 matching lines @@
                  cgi.escape(email), cgi.escape(author))
 
         return '<br/>'.join(map(author_html, self.latest_version.pubspec.authors))
 
     @property
     def uploaders_title(self):
         """The title for the uploaders list of the package."""
         return 'Uploader' if len(self.latest_version.pubspec.authors) == 1 \
             else 'Uploaders'
 
-    # TODO(kustermann): When we have string emails, this needs to be changed
-    # to read uploaderEmails instead of uploaders.
     @property
     def uploaders_html(self):
         """Inline HTML for the uploaders of this package."""
-        return '<br/>'.join(cgi.escape(uploader.nickname())
-                         for uploader in self.uploaders)
+        return '<br/>'.join(cgi.escape(email)
+                         for email in self.uploaderEmails)
 
     @property
     def short_updated(self):
         """The short updated time of the package."""
         return self.updated.strftime('%b %d, %Y')
 
     @classmethod
     def new(cls, **kwargs):
         """Construct a new package.
 
@@ skipping 20 matching lines @@
         """Determine whether a package with the given name exists."""
         return cls.get_by_key_name(name) is not None
 
     def has_version(self, version):
         """Determine whether this package has a given version uploaded."""
         from package_version import PackageVersion
         version = PackageVersion.get_by_name_and_version(
             self.name, str(version))
         return version is not None
 
-    # TODO(kustermann): When we have string emails, this needs to be changed
-    # to read uploaderEmails instead of uploaders.
     def has_uploader(self, uploader):
         """Determine whether the given user is an uploader for this package.
 
         This compares users via case-insensitive email comparison.
 
         Although admins have uploader privileges for all packages, this will not
         return True for admins.
         """
         return uploader.email().lower() in \
-            [u.email().lower() for u in self.uploaders]
+            [email.lower() for email in self.uploaderEmails]
 
     @property
     def url(self):
         """The API URL for this package."""
         return models.url(
             controller='api.packages', action='show', id=self.name)
 
-    # TODO(kustermann): When we have string emails, this needs to be changed
-    # to read uploaderEmails instead of uploaders.
     def as_dict(self, full=False):
         """Returns the dictionary representation of this package.
 
         This is used to represent the package in API responses. Normally this
         just includes URLs and some information about the latest version, but if
         full is True, it will include all available information about the
         package.
         """
 
         value = {
             'name': self.name,
             'url': self.url,
             'uploaders_url': self.url + '/uploaders',
             'version_url': self.url + '/versions/{version}',
             'new_version_url': self.url + '/versions/new',
             'latest': self.latest_version and self.latest_version.as_dict()
         }
 
         if full:
             value.update({
                 'created': self.created.isoformat(),
                 'downloads': self.downloads,
-                'uploaders': [uploader.email() for uploader in self.uploaders],
+                'uploaders': [email for email in self.uploaderEmails],
                 'versions': [version.as_dict() for version in self.version_set]
             })
 
         return value
 
     def as_json(self):
         """Returns the JSON stringified representation of the full information
         for this package.
         """
         cached = memcache.get(self._package_json_cache_key)
@@ skipping 12 matching lines @@
         description of the package changes. This isn't often since most package
         data is immutable, but when the uploader list changes or new versions
         of the package are uploaded, the data will change.
         """
         memcache.delete(self._package_json_cache_key)
 
     @property
     def _package_json_cache_key(self):
         """The memcache key for the cached JSON for this package."""
         return 'package_json_' + self.name