Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop deprecated force_text() #327

Merged
merged 3 commits into from
Apr 24, 2021

Conversation

mfonism
Copy link
Contributor

@mfonism mfonism commented Mar 27, 2020

This PR improves Django 3 support in django-user-accounts.

It will drop private Python 2 compatibility APIs as well as features deprecated in Django 3.0

It was inspired by (and will fix) #325, and was guided by the Django 3.0 release notes.

It will drop the deprecated utility function django.utils.encoding.force_text(), and replace it with django.utils.encoding.force_str()

@jonathan-s
Copy link
Contributor

I'd suggest that you remove this commit -> cd058bc and keep the other two commits. #323 fixes that and adds a test as well. So that commit isn't necessary as long as that PR gets merged in.

@mfonism
Copy link
Contributor Author

mfonism commented Aug 12, 2020

@jonathan-s

Sure, I can do this.

I'll work on it as soon as I have access to a PC with good internet connection. Thanks.

@jonathan-s
Copy link
Contributor

Splendid :)

@KatherineMichel
Copy link
Member

@jonathan-s Thank you for the input!

@mfonism mfonism force-pushed the 2020.03.27/improve-django3-support branch 3 times, most recently from ffd02b1 to 35de838 Compare August 12, 2020 22:23
@mfonism mfonism force-pushed the 2020.03.27/improve-django3-support branch from 35de838 to c9d3d3e Compare August 12, 2020 22:24
@mfonism mfonism changed the title Improve Django 3 Support Drop deprecated force_text() Aug 12, 2020
@mfonism
Copy link
Contributor Author

mfonism commented Aug 12, 2020

Done.

@jonathan-s
Copy link
Contributor

@mfonism Thanks for doing this, it looks like there is a conflict with current master, so if you're able to rebase against current master that would be excellent!

@mfonism
Copy link
Contributor Author

mfonism commented Aug 13, 2020

@jonathan-s I already rebased the branch against current master (and I've checked again that I did this). Plus, github isn't telling me there's a conflict...
git-conflict

@jonathan-s
Copy link
Contributor

@mfonism I'm sorry! It must've been a glitch then. My bad.

@KatherineMichel, this all good on my side, and I'd be happy to have this merged :)

jonathan-s
jonathan-s previously approved these changes Aug 13, 2020
@KatherineMichel
Copy link
Member

@brosner @paltman Any idea why status checks are stalling? I don't think I have access to Pinax CircleCI to fix.

@jonathan-s
Copy link
Contributor

jonathan-s commented Aug 20, 2020 via email

@fedosov
Copy link

fedosov commented Apr 16, 2021

Hello! Any change this being merged? Thank you.

@paltman paltman merged commit 319426f into pinax:master Apr 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants