Snake case

merge-requests/22/merge
Bob Mottram 2021-12-26 18:05:54 +00:00
parent 1129862acb
commit cd5a897184
3 changed files with 10 additions and 10 deletions

View File

@ -252,7 +252,7 @@ from utils import isDM
from utils import replace_users_with_at
from utils import local_actor_url
from utils import is_float
from utils import validPassword
from utils import valid_password
from utils import removeLineEndings
from utils import get_base_content_from_post
from utils import acct_dir
@ -1687,7 +1687,7 @@ class PubServer(BaseHTTPRequestHandler):
return
self.server.last_login_time = int(time.time())
if register:
if not validPassword(loginPassword):
if not valid_password(loginPassword):
self.server.POSTbusy = False
if callingDomain.endswith('.onion') and onion_domain:
self._redirect_headers('http://' + onion_domain +
@ -4971,7 +4971,7 @@ class PubServer(BaseHTTPRequestHandler):
removeLineEndings(fields['password'])
fields['passwordconfirm'] = \
removeLineEndings(fields['passwordconfirm'])
if validPassword(fields['password']) and \
if valid_password(fields['password']) and \
fields['password'] == fields['passwordconfirm']:
# set password
storeBasicCredentials(base_dir, nickname,

View File

@ -65,7 +65,7 @@ from utils import setConfigParam
from utils import is_group_actor
from utils import date_string_to_seconds
from utils import date_seconds_to_string
from utils import validPassword
from utils import valid_password
from utils import userAgentDomain
from utils import camelCaseSplit
from utils import decoded_host
@ -5681,11 +5681,11 @@ def _testDateConversions() -> None:
def _testValidPassword():
print('testValidPassword')
assert not validPassword('123')
assert not validPassword('')
assert validPassword('パスワード12345')
assert validPassword('测试密码12345')
assert validPassword('A!bc:defg1/234?56')
assert not valid_password('123')
assert not valid_password('')
assert valid_password('パスワード12345')
assert valid_password('测试密码12345')
assert valid_password('A!bc:defg1/234?56')
def _testGetPriceFromString() -> None:

View File

@ -2953,7 +2953,7 @@ def removeLineEndings(text: str) -> str:
return text.strip()
def validPassword(password: str) -> bool:
def valid_password(password: str) -> bool:
"""Returns true if the given password is valid
"""
if len(password) < 8: