innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #30116 -- Removed unnecessary str() calls in CommonPasswordValidator. 

open() and gzip.open() supports path-like objects since Python 3.6.
This commit is contained in:
Jon Dufresne 2019-05-22 10:47:29 -07:00 committed by Mariusz Felisiak
parent 888fdf182e
commit b711eafd2a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/password_validation.py
View File

@ -171,10 +171,10 @@ class CommonPasswordValidator:
def __init__(self, password_list_path=DEFAULT_PASSWORD_LIST_PATH): def __init__(self, password_list_path=DEFAULT_PASSWORD_LIST_PATH):
try: try:
with gzip.open(str(password_list_path), 'rt') as f: with gzip.open(password_list_path, 'rt') as f:
self.passwords = {x.strip() for x in f} self.passwords = {x.strip() for x in f}
except OSError: except OSError:
with open(str(password_list_path)) as f: with open(password_list_path) as f:
self.passwords = {x.strip() for x in f} self.passwords = {x.strip() for x in f}
def validate(self, password, user=None): def validate(self, password, user=None):