utils.datastructures.SortDict don't work after pop or popitem method called

[glin@…]

utils.datastructures.SortDict don't work after pop or popitem method called, here is example:

In [1]: from django.utils.datastructures import SortedDict

In [2]: s=SortedDict({1:2,3:4,2:3})

In [3]: s.popitem()
Out[3]: (1, 2)

In [4]: s.items()
---------------------------------------------------------------------------
exceptions.KeyError                                  Traceback (most recent call last)

/home/glin/programming/workspace/nicms/<ipython console>

/usr/lib/python2.4/site-packages/django/utils/datastructures.py in items(self)
     72
     73     def items(self):
---> 74         return zip(self.keyOrder, self.values())
     75
     76     def keys(self):

/usr/lib/python2.4/site-packages/django/utils/datastructures.py in values(self)
     78
     79     def values(self):
---> 80         return [dict.__getitem__(self, k) for k in self.keyOrder]
     81
     82     def update(self, dict):

KeyError: 1

It is because pop and popitem methods are not overriden, so items in keyOrder attribute are not deleted.

[Chris Beaven]

Glin, could you please attach a diff instead of the whole file? Thanks.

[glin@…]

Of course, I just uploaded wrong file ;).

[Chris Beaven]

Thanks, add some tests and it'll be ready

[Glin <glin@…>]

Tests added.

[Malcolm Tredinnick]

This was fixed as part of [6593].