From 3543e128df87abd31816f6914503c3b9621d0388 Mon Sep 17 00:00:00 2001
From: Gary Wilson Jr <gary.wilson@gmail.com>
Date: Mon, 30 Mar 2009 22:01:40 +0000
Subject: [PATCH] [1.0.X]: Fixed #8140 -- Made `UserManager.create_superuser`
 return the new `User` object, based on patch from ericholscher.

Backport of r10217 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/auth/models.py      |  1 +
 django/contrib/auth/tests/basic.py | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 4d3189b08b..e440f67c3b 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -120,6 +120,7 @@ class UserManager(models.Manager):
         u.is_active = True
         u.is_superuser = True
         u.save()
+        return u
 
     def make_random_password(self, length=10, allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'):
         "Generates a random password with the given length and given allowed_chars"
diff --git a/django/contrib/auth/tests/basic.py b/django/contrib/auth/tests/basic.py
index 2071710279..0b49a45728 100644
--- a/django/contrib/auth/tests/basic.py
+++ b/django/contrib/auth/tests/basic.py
@@ -24,6 +24,8 @@ True
 False
 >>> u.is_active
 True
+>>> u.is_superuser
+False
 
 >>> a = AnonymousUser()
 >>> a.is_authenticated()
@@ -32,11 +34,22 @@ False
 False
 >>> a.is_active
 False
+>>> a.is_superuser
+False
 >>> a.groups.all()
 []
 >>> a.user_permissions.all()
 []
 
+# superuser tests.
+>>> super = User.objects.create_superuser('super', 'super@example.com', 'super')
+>>> super.is_superuser
+True
+>>> super.is_active
+True
+>>> super.is_staff
+True
+
 #
 # Tests for createsuperuser management command.
 # It's nearly impossible to test the interactive mode -- a command test helper