summaryrefslogtreecommitdiff
path: root/django/contrib/auth
diff options
context:
space:
mode:
authorRodolfo Carvalho <rhcarvalho@gmail.com>2014-03-02 15:25:53 +0100
committerTim Graham <timograham@gmail.com>2014-03-03 07:38:09 -0500
commit0d912258921a442c48d5787228db2db5af7e8fa5 (patch)
treef6826425de5bca2498c46e5242b870282a34eda2 /django/contrib/auth
parent6acaa5238668593d6d854b28dbfa65e95796585c (diff)
Fixed many typos in comments and docstrings.
Thanks Piotr Kasprzyk for help with the patch.
Diffstat (limited to 'django/contrib/auth')
-rw-r--r--django/contrib/auth/decorators.py2
-rw-r--r--django/contrib/auth/hashers.py2
-rw-r--r--django/contrib/auth/tests/test_management.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/auth/decorators.py b/django/contrib/auth/decorators.py
index 6a976b48dc..12a79c0918 100644
--- a/django/contrib/auth/decorators.py
+++ b/django/contrib/auth/decorators.py
@@ -56,7 +56,7 @@ def login_required(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login
def permission_required(perm, login_url=None, raise_exception=False):
"""
Decorator for views that checks whether a user has a particular permission
- enabled, redirecting to the log-in page if neccesary.
+ enabled, redirecting to the log-in page if necessary.
If the raise_exception parameter is given the PermissionDenied exception
is raised.
"""
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
index 992e19e2a4..4e40a7c2ba 100644
--- a/django/contrib/auth/hashers.py
+++ b/django/contrib/auth/hashers.py
@@ -186,7 +186,7 @@ class BasePasswordHasher(object):
def salt(self):
"""
- Generates a cryptographically secure nonce salt in ascii
+ Generates a cryptographically secure nonce salt in ASCII
"""
return get_random_string()
diff --git a/django/contrib/auth/tests/test_management.py b/django/contrib/auth/tests/test_management.py
index f0dc66baa3..c78142722f 100644
--- a/django/contrib/auth/tests/test_management.py
+++ b/django/contrib/auth/tests/test_management.py
@@ -39,7 +39,7 @@ def mock_inputs(inputs):
def mock_input(prompt):
# prompt should be encoded in Python 2. This line will raise an
- # Exception if prompt contains unencoded non-ascii on Python 2.
+ # Exception if prompt contains unencoded non-ASCII on Python 2.
prompt = str(prompt)
assert str('__proxy__') not in prompt
response = ''