Update develop

This commit is contained in:
Luke Rogers 2012-06-11 10:36:29 +12:00
parent f2ec2eb8d3
commit 20b0e46a28

View file

@ -16,30 +16,28 @@ def gen_password(types):
except ValueError:
length = 10
needs_def = 0
#alpha characters
# add alpha characters
if "alpha" in types or "letter" in types:
okay = okay + string.ascii_lowercase
#adds capital characters if not told not to
if "no caps" not in types:
okay = okay + string.ascii_uppercase
else:
needs_def = 1
#adds numbers
# add numbers
if "numeric" in types or "numbers" in types:
okay = okay + [str(x) for x in range(0, 10)]
else:
needs_def = 1
#adds symbols
# add symbols
if "symbols" in types:
sym = ['!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '-', '=', '_', '+', '[', ']', '{', '}', '\\', '|', ';', ':', "'", '.', '>', ',', '<', '/', '?', '`', '~', '"']
okay = okay + sym
else:
needs_def = 1
#defaults to lowercase alpha password if no arguments are found
if needs_def == 1:
okay += okay + sym
# defaults to lowercase alpha password if the okay list is empty
if not okay:
okay = okay + string.ascii_lowercase
password = ""
# generates password
for x in range(length):
password = password + random.choice(okay)