Merge pull request #12 from nhr/BZ844609

Fixed random password generator

Author: smarterclayton

wsgi/openshift/openshiftlibs.py

@@ -63,15 +63,17 @@ def make_secure_key(key_info):
 	key      = key_info['variable']
 	original = key_info['original']
 
-	chars  = '0123456789'
-	chars += 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-	chars += '!@#%^&*()'
-	chars += '-_ []{}<>~`+=,.;:/?|'
+	# These are the legal password characters
+	# as per the Django source code
+	# (django/contrib/auth/models.py)
+	chars  = 'abcdefghjkmnpqrstuvwxyz'
+	chars += 'ABCDEFGHJKLMNPQRSTUVWXYZ'
+	chars += '23456789'
 
 	# Use the hash to seed the RNG
 	random.seed(int("0x" + hashcode[:8], 0))
 
-    # Create a random string the same length as the default
+	# Create a random string the same length as the default
 	rand_key = ''
 	for _ in range(len(original)):
 		rand_pos = random.randint(0,len(chars))