Cleanup to use get_random_string consistently.

Removes several ad hoc implementations of get_random_string()
and removes an innapropriate use of settings.SECRET_KEY.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17580 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 8 insertions, 6 deletions

diff --git a/django/utils/crypto.py b/django/utils/crypto.py
index 4fe11f428c..a54c455e1b 100644
--- a/django/utils/crypto.py
+++ b/django/utils/crypto.py
@@ -7,6 +7,13 @@ import struct
 import hashlib
 import binascii
 import operator
+
+import random
+try:
+    random = random.SystemRandom()
+except NotImplementedError:
+    pass
+
 from django.conf import settings
 
 
@@ -43,13 +50,8 @@ def get_random_string(length=12,
     Returns a random string of length characters from the set of a-z, A-Z, 0-9.
 
     The default length of 12 with the a-z, A-Z, 0-9 character set returns
-    a 71-bit salt. log_2((26+26+10)^12) =~ 71 bits
+    a 71-bit value. log_2((26+26+10)^12) =~ 71 bits
     """
-    import random
-    try:
-        random = random.SystemRandom()
-    except NotImplementedError:
-        pass
     return ''.join([random.choice(allowed_chars) for i in range(length)])