Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting of error

Browse Source 
Makes it more readable (rather than a repr string)
This commit is contained in:
Michael Terry
2018-03-16 13:49:24 -04:00
committed by Michael Terry
parent 924dd18f2b
commit 97a938ccd5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openedx/core/djangoapps/user_api/accounts/api.py
View File

@@ -657,8 +657,10 @@ def _validate_password(password, username=None):
_validate_type(password, basestring, accounts.PASSWORD_BAD_TYPE_MSG)
validate_password(password, username=username)
except (errors.AccountDataBadType, ValidationError) as invalid_password_err:
except errors.AccountDataBadType as invalid_password_err:
raise errors.AccountPasswordInvalid(text_type(invalid_password_err))
except ValidationError as validation_err:
raise errors.AccountPasswordInvalid(validation_err.message)
def _validate_country(country):

8
openedx/core/djangoapps/user_api/validation/tests/test_views.py
View File

@@ -175,7 +175,7 @@ class RegistrationValidationViewTests(test_utils.ApiTestCase):
msg = u'Password: Invalid Length (must be {0} characters or more)'.format(password_min_length())
self.assertValidationDecision(
{'password': ''},
{"password": text_type([msg])}
{"password": msg}
)
def test_password_bad_min_length_validation_decision(self):
@@ -183,7 +183,7 @@ class RegistrationValidationViewTests(test_utils.ApiTestCase):
msg = u'Password: Invalid Length (must be {0} characters or more)'.format(password_min_length())
self.assertValidationDecision(
{'password': password},
{"password": text_type([msg])}
{"password": msg}
)
def test_password_bad_max_length_validation_decision(self):
@@ -191,11 +191,11 @@ class RegistrationValidationViewTests(test_utils.ApiTestCase):
msg = u'Password: Invalid Length (must be {0} characters or fewer)'.format(password_max_length())
self.assertValidationDecision(
{'password': password},
{"password": text_type([msg])}
{"password": msg}
)
def test_password_equals_username_validation_decision(self):
self.assertValidationDecision(
{"username": "somephrase", "password": "somephrase"},
{"username": "", "password": text_type([u"Password cannot be the same as the username"])}
{"username": "", "password": u"Password cannot be the same as the username"}
)