Changeset aa8c9d in indico

Timestamp:

08/23/11 15:38:48 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

3e03b8

Parents:

1d9f4e

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (05/09/11 13:52:25)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/23/11 15:38:48)

Message:

[REF] Get rid of py2.7 OrderedDict?

Location:

indico/web/http_api

Files:

• html.py (modified) (2 diffs)
• html4.tpl (modified) (1 diff)

indico/web/http_api/html.py

@@ -21 +21 @@
 # python stdlib imports
 import os
-from collections import OrderedDict
+from operator import itemgetter
 
 # module imports
@@ -39 +39 @@
             results = [results]
 
-        orderedFossils = OrderedDict()
+        unorderedFossils = {}
         for fossil in results:
-            orderedFossils.setdefault(fossil['startDate'].date(), []).append(fossil)
+            unorderedFossils.setdefault(fossil['startDate'].date(), []).append(fossil)
 
+        orderedFossils = sorted(unorderedFossils.items(), key=itemgetter(0))
         return render(os.path.join(os.path.dirname(__file__), 'html4.tpl'),
                       {'fossils': orderedFossils, 'ts': fossils['ts']})

indico/web/http_api/html4.tpl

@@ -1 +1 @@
 <ul class="indico_event_list" data-ts="${ts}">
-% for date, events in fossils.iteritems():
+% for date, events in fossils:
 <li>
   <span class="indico_event_list_day">${date.strftime("%A %B %d, %Y")}</span>