Address concerns in Issue #543

- Fixed PEP-008 issues.
- Removed .user-{user} from the tag URI and put it before the domain,
  such as {user}@{host} instead.
- Use year from collection.created instead of current year.

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index dea47fbf4bf64bf38ff8e7536114d2bd7f84fae2..8602c5838e97278f12f89fcafcfe643829064b8b 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -539,14 +539,16 @@ def collection_atom_feed(request):
                 'href': push_url})
 
     feed = AtomFeed(
-               "MediaGoblin: Feed for %s's collection %s" % (request.matchdict['user'], collection.title),
-               feed_url=request.url,
-               id='tag:{host},{year}:collection.user-{user}.title-{title}'.format(
-                   host=request.host,
-                   year=datetime.datetime.today().strftime('%Y'),
-                   user=request.matchdict['user'],
-                   title=collection.title),
-               links=atomlinks)
+                "MediaGoblin: Feed for %s's collection %s" %
+                (request.matchdict['user'], collection.title),
+                feed_url=request.url,
+                id=u'tag:{user}@{host},{year}:collection.slug-{slug}'\
+                    .format(
+                    host=request.host,
+                    year=collection.created.strftime('%Y'),
+                    user=request.matchdict['user'],
+                    slug=collection.slug),
+                links=atomlinks)
 
     for item in cursor:
         entry = item.get_media_entry