compat: (py2) urlparse = urllib.parse (py3)

[stephenfin]

We were mistakenly importing the 'urlparse' function from the Python 2
'urlparse' module, as opposed to the module itself. Correct this.

Signed-off-by: Stephen Finucane stephen@that.guru
Closes: #6261

[xordoquy]

now this has been brought into the spotlight, I'd rather we keep a consistent style and import:

from django.utils.six.moves.urllib import parse as urlparse

in the renderers.

edit:
or change the other imports.

[stephenfin]

now this has been brought into the spotlight, I'd rather we keep a consistent style and import:

from django.utils.six.moves.urllib import parse as urlparse

in the renderers.

edit:
or change the other imports.

Good call. Done.

[carltongibson]

OK, given #6230 this'll be v3.9.1 or not at all.

[carltongibson]

I'm sorry to say that at this late point in history I'm so rusty on Python 2 compat that I can't remember the back story here.

No doubt, using six is the right way to go, but what's wrong the the code in compat, and where haven't we hit an error before?

Thanks.

[stephenfin]

That code we're removing is only used in one place and was added as part of the new command. It's been broken from the get-go and should never have been added, given that six provides a perfectly good wrapper. @xordoquy is therefore correct in suggesting we simply replace the broken code with a well-tested wrapper we already use mostly everywhere. Make sense?

[carltongibson]

...was added as part of the new command.

Right. OK. Fine. Thanks. 😊

[johnthagen]

Not sure on timelines, but there is also the ongoing work to simply drop Python 2 (#6230, #6277) at which point all of the six code shouldn't be necessary.

[tomchristie]

Fair enough. Thanks!