summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul McMillan <Paul@McMillan.ws>2011-10-18 20:28:52 +0000
committerPaul McMillan <Paul@McMillan.ws>2011-10-18 20:28:52 +0000
commit67565a5379f19c6ca94e2c4f3b8e01684b32fe8f (patch)
tree80c5c2203eabb6abc633659c029845d804883c0b
parent14d24eb438c9930ff76302f263d0f2a8b42d13c1 (diff)
Remove comments referencing encryption. Django doesn't do encryption.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/auth/models.py2
-rw-r--r--django/contrib/auth/utils.py2
-rw-r--r--django/forms/forms.py2
-rw-r--r--django/forms/formsets.py2
-rw-r--r--django/forms/widgets.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 04e68aa48d..0aa1c188e6 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -220,7 +220,7 @@ class User(models.Model):
def check_password(self, raw_password):
"""
Returns a boolean of whether the raw_password was correct. Handles
- encryption formats behind the scenes.
+ hashing formats behind the scenes.
"""
# Backwards-compatibility check. Older passwords won't include the
# algorithm or salt.
diff --git a/django/contrib/auth/utils.py b/django/contrib/auth/utils.py
index 57c693f879..520c25e3c8 100644
--- a/django/contrib/auth/utils.py
+++ b/django/contrib/auth/utils.py
@@ -41,7 +41,7 @@ def get_random_string(length=12, allowed_chars='abcdefghijklmnopqrstuvwxyzABCDEF
def check_password(raw_password, enc_password):
"""
Returns a boolean of whether the raw_password was correct. Handles
- encryption formats behind the scenes.
+ hashing formats behind the scenes.
"""
parts = enc_password.split('$')
if len(parts) != 3:
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 48378367a1..1400be3014 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -358,7 +358,7 @@ class BaseForm(StrAndUnicode):
def is_multipart(self):
"""
- Returns True if the form needs to be multipart-encrypted, i.e. it has
+ Returns True if the form needs to be multipart-encoded, i.e. it has
FileInput. Otherwise, False.
"""
for field in self.fields.values():
diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index 186f034a24..9cdd05198c 100644
--- a/django/forms/formsets.py
+++ b/django/forms/formsets.py
@@ -325,7 +325,7 @@ class BaseFormSet(StrAndUnicode):
def is_multipart(self):
"""
- Returns True if the formset needs to be multipart-encrypted, i.e. it
+ Returns True if the formset needs to be multipart, i.e. it
has FileInput. Otherwise, False.
"""
return self.forms and self.forms[0].is_multipart()
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 1c16f288a9..5b50f37b67 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -140,7 +140,7 @@ class MediaDefiningClass(type):
class Widget(object):
__metaclass__ = MediaDefiningClass
is_hidden = False # Determines whether this corresponds to an <input type="hidden">.
- needs_multipart_form = False # Determines does this widget need multipart-encrypted form
+ needs_multipart_form = False # Determines does this widget need multipart form
is_localized = False
is_required = False