summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorDusty Phillips <dusty@gerolde.archlinux.org>2009-08-12 17:33:23 -0400
committerDusty Phillips <dusty@gerolde.archlinux.org>2009-08-12 17:33:23 -0400
commit6bcf9709f20db8b8e3e40c16b20448f3899f3624 (patch)
treeffc8ef24c6e6d21f0e79c4c3e172ddb490939f76 /devel
parenta085da1c22f7cc8ea245ec2fc018cd5eaadc3032 (diff)
merge fix
Diffstat (limited to 'devel')
-rw-r--r--devel/views.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/views.py b/devel/views.py
index 4c34d9f5..f9aacec2 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -8,8 +8,8 @@ from archweb_dev.main.models import Package, Todolist
from archweb_dev.main.models import Arch, Repo
from archweb_dev.main.models import UserProfile, News
import random
-from string import letters, digits
-pwletters = letters + digits
+from string import ascii_letters, digits
+pwletters = ascii_letters + digits
def index(request):
@@ -94,7 +94,7 @@ class NewUserForm(forms.ModelForm):
profile.save()
send_mail("Your new archweb account",
- """You can now log into:
+ """You can now log into:
https://dev.archlinux.org/
with these login details:
Username: %s