django.utils.six and django.utils.encoding both define python_2_unicode_compatible

[Marten Kenbeek]

django.utils.six and django.utils.encoding define the exact same method definition of python_2_unicode_compatible, which is not very DRY. It might be a good idea to replace one of them with a convenience import of the other.

[Matthew Somerville]

The function was added to six in 1.9.0, copied from Django's code. PR at ​https://github.com/django/django/pull/4784 to have it include one from the other, I was unsure whether it was better to maintain the function in encoding.

[Andriy Sokolovskiy]

If we're going to use the method from six, seems we should to deprecate import from django utils, and replace imports inside the django code to use six import instead of utils.

[Carl Meyer]

I don't think it's worth putting users through a deprecation process on the import location of python_2_unicode_compatible, when we could just provide a non-deprecated import shim and leave it there until Python 2 support is dropped entirely. That's a lot of hassle for Django users in order to save us a single import line in django.utils.encoding.

I do think it's good to switch to relying on the implementation in six.

[Markus Holtermann]

PR: ​https://github.com/django/django/pull/4788

[Carl Meyer]

@markush there was already a PR contributed, see above

[Markus Holtermann]

Oh, missed that. Thanks Carl.

[Aymeric Augustin]

I agree, let's drop our version and import six'. As Carl said on the PR a comment explaining the import is needed.

[Tim Graham <timograham@…>]

In c91bc68:

Fixed #24927 -- Used python_2_unicode_compatible from six