Changing imports to have Django 3 compatibility. #219
Conversation
There was a problem hiding this comment.
Thanks for this submission! I'm glad to see that the upgrade to Django 3 can go smoothly.
Since we are focusing on sticking to supported versions of Django, rather than add a six dependency in tests, perhaps we can just rip out Python 2 stuff entirely.
Have you had an opportunity to run these changes in production anywhere yet?
| from django.utils.encoding import force_str | ||
| except ImportError: | ||
| # Required for Django < 1.5 | ||
| if django.VERSION < (1, 5): |
There was a problem hiding this comment.
we don't support Django 1.5 anymore so we can outright remove this branch
There was a problem hiding this comment.
I have test these changes in production for my user case (just pretty maps for GeoDjango for some locations) and it works. Tests are fine and the upgrade to Django 3 was just six dependency. I do not think it will break anything. If you want, I can remove all Django 1.5 references for this pull request.
|
Alright, I took these changes and slightly modified them over in #222 , I'm going to leave it open for a day and if it looks good I'll prepare a new release with these changes. Thank you again for the work in sending in this changeset, really wish I had noticed this earlier |
I have made some corrections to fix compatibility for Django 3. Also, I have normalized imports to use version checks instead of the try except pattern.