From fdb6baf4e62fb281cae352aca7567524aadb566f Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Fri, 20 Dec 2013 11:00:07 +0000 Subject: [PATCH] Use collections.OrderedDict instead of the SortedDict bundled with Django - Legacy-Id: 7026 --- ietf/iesg/agenda.py | 3 +-- ietf/nomcom/views.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py index d9c69ac81..7a373239f 100644 --- a/ietf/iesg/agenda.py +++ b/ietf/iesg/agenda.py @@ -2,8 +2,7 @@ import codecs, re, os, datetime -# FIXME: once we're on Python 2.7, replace with: from collections import OrderedDict -from django.utils.datastructures import SortedDict as OrderedDict +from collections import OrderedDict from django.http import Http404 from django.conf import settings diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index fa3a8afdc..1e27721bd 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import datetime, re, json +from collections import OrderedDict from django.conf import settings from django.contrib.auth.decorators import login_required @@ -10,7 +11,6 @@ from django.http import HttpResponse, Http404, HttpResponseRedirect, HttpRespons from django.shortcuts import render_to_response, get_object_or_404, render, redirect from django.template import RequestContext from django.template.loader import render_to_string -from django.utils.datastructures import SortedDict from django.db.models import Count from django.forms.models import modelformset_factory, inlineformset_factory @@ -622,7 +622,7 @@ def view_feedback_pending(request, year): formset = FeedbackFormSet(queryset=feedbacks) for form in formset.forms: form.set_nomcom(nomcom, request.user) - type_dict = SortedDict({}) + type_dict = OrderedDict() for t in FeedbackType.objects.all().order_by('pk'): rest = t.name slug = rest[0]