SortedDict.update() should accept tuples or generators

[Paul Winkler]

dict.update() accepts dictionaries, tuples of pairs, lists of pairs, or any generator of pairs.
But SortedDict.update() only accepts dicts.

This patch fixes that. With test.

[Julien Phalip]

I think that makes sense. Perhaps the docs could be improved too, giving more examples about the various possibilities: ​http://docs.djangoproject.com/en/dev/ref/utils/#django.utils.datastructures.SortedDict

[Łukasz Rekucki]

Sorry for the noise, but:

getattr(dict_, 'iteritems', None) is not None

strikes me as far less readable then:

hasattr(dict_, 'iteritems')

[Aymeric Augustin]

Change UI/UX from NULL to False.

[Aymeric Augustin]

Change Easy pickings from NULL to False.

[Ryan Kaskel]

I've taken a slightly different approach here and have followed Python's OrderedDict by using MutableMapping.update (​http://hg.python.org/releasing/2.7.3/file/7bb96963d067/Lib/_abcoll.py#l483).

While Python's dict does indeed take any iterable of 2-item pairs, it also takes extra keyword arguments.

I didn't document those here since it doesn't preserve ordering but I did link to Python's dict.update documentation.

SortedDict.update now behaves just like dict.update and OrderedDict.update.

Pull request here: ​https://github.com/django/django/pull/1158

[Aymeric Augustin]

Please do not mark your own patches as RFC; have them reviewed by another contributor. Thank you!

[Ryan Kaskel]

This may become irrelevant if Django 1.7 switches to OrderedDict.

Is there a ticket tracking the update of that data structure or the removal of Py2.6 related code in general?

[Aymeric Augustin]

No, there isn't, we're doing it piecemeal.

[Tim Graham]

SortedDict has been deprecated in 07876cf02b6db453ca0397c29c225668872fa96d