[PATCH] Resolve removed 'AUTH_PROFILE_MODULE' setting
Stephen Finucane
stephenfinucane at hotmail.com
Tue Nov 18 10:01:59 AEDT 2014
The 'AUTH_PROFILE_MODULE' setting, and the 'get_profile()' method on
the 'User' model are removed in Django 1.7. This causes errors when
using Patchwork with Django 1.7+.
There are three changes necessary:
* Replace profile model's 'ForeignKey' with a 'OneToOneField'
* Remove all 'get_profile()' calls
* Delete 'AUTH_PROFILE_MODULE' settings from 'settings.py'
These changes are discussed here:
http://deathofagremmie.com/2014/05/24/retiring-get-profile-and-auth-profile-module/
Django 1.6 also introduces two other notable changes:
* The 'XViewMiddleware' module has been moved
* A new test runner has been introduced
It is not possible to fix these issues without breaking compatibility
with Django 1.5. As a result they have been ignored and must be
resolved in a future release.
Signed-off-by: Stephen Finucane <stephenfinucane at hotmail.com>
---
apps/patchwork/filters.py | 4 ++--
apps/patchwork/models.py | 17 ++++++++---------
apps/patchwork/paginator.py | 2 +-
apps/patchwork/tests/test_bundles.py | 2 +-
apps/patchwork/tests/utils.py | 2 +-
apps/patchwork/views/user.py | 14 +++++++-------
apps/settings.py | 2 --
7 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index 8323fe8..8ad0f40 100644
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -350,7 +350,7 @@ class DelegateFilter(Filter):
def condition(self):
if self.delegate:
- return self.delegate.get_profile().name()
+ return self.delegate.profile.name()
return self.no_delegate_str
def _form(self):
@@ -378,7 +378,7 @@ class DelegateFilter(Filter):
selected = ' selected'
str += '<option %s value="%s">%s</option>' % (selected,
- d.id, d.get_profile().name())
+ d.id, d.profile.name())
str += '</select>'
return mark_safe(str)
diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 4bed9b8..76b0a44 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -31,7 +31,7 @@ import random
class Person(models.Model):
email = models.CharField(max_length=255, unique = True)
name = models.CharField(max_length=255, null = True, blank = True)
- user = models.ForeignKey(User, null = True, blank = True,
+ user = models.OneToOneField(User, null = True, blank = True,
on_delete = models.SET_NULL)
def __unicode__(self):
@@ -41,7 +41,7 @@ class Person(models.Model):
return self.email
def link_to_user(self, user):
- self.name = user.get_profile().name()
+ self.name = user.profile.name()
self.user = user
class Meta:
@@ -63,14 +63,14 @@ class Project(models.Model):
def is_editable(self, user):
if not user.is_authenticated():
return False
- return self in user.get_profile().maintainer_projects.all()
+ return self in user.profile.maintainer_projects.all()
class Meta:
ordering = ['linkname']
class UserProfile(models.Model):
- user = models.ForeignKey(User, unique = True)
+ user = models.OneToOneField(User, unique = True, related_name='profile')
primary_project = models.ForeignKey(Project, null = True, blank = True)
maintainer_projects = models.ManyToManyField(Project,
related_name = 'maintainer_project')
@@ -94,7 +94,6 @@ class UserProfile(models.Model):
submitter__in = submitters)
.values('project_id').query)
-
def sync_person(self):
pass
@@ -121,7 +120,7 @@ class UserProfile(models.Model):
def _user_saved_callback(sender, created, instance, **kwargs):
try:
- profile = instance.get_profile()
+ profile = instance.profile
except UserProfile.DoesNotExist:
profile = UserProfile(user = instance)
profile.save()
@@ -175,7 +174,7 @@ class Patch(models.Model):
name = models.CharField(max_length=255)
date = models.DateTimeField(default=datetime.datetime.now)
submitter = models.ForeignKey(Person)
- delegate = models.ForeignKey(User, blank = True, null = True)
+ delegate = models.OneToOneField(User, blank = True, null = True)
state = models.ForeignKey(State, default=get_default_initial_patch_state)
archived = models.BooleanField(default = False)
headers = models.TextField(blank = True)
@@ -245,7 +244,7 @@ class Comment(models.Model):
unique_together = [('msgid', 'patch')]
class Bundle(models.Model):
- owner = models.ForeignKey(User)
+ owner = models.OneToOneField(User)
project = models.ForeignKey(Project)
name = models.CharField(max_length = 50, null = False, blank = False)
patches = models.ManyToManyField(Patch, through = 'BundlePatch')
@@ -313,7 +312,7 @@ class EmailConfirmation(models.Model):
('optout', 'Email opt-out'),
])
email = models.CharField(max_length = 200)
- user = models.ForeignKey(User, null = True)
+ user = models.OneToOneField(User, null = True)
key = HashField()
date = models.DateTimeField(default = datetime.datetime.now)
active = models.BooleanField(default = True)
diff --git a/apps/patchwork/paginator.py b/apps/patchwork/paginator.py
index 8d8be64..31c0190 100644
--- a/apps/patchwork/paginator.py
+++ b/apps/patchwork/paginator.py
@@ -37,7 +37,7 @@ class Paginator(paginator.Paginator):
patches_per_page = settings.DEFAULT_PATCHES_PER_PAGE
if request.user.is_authenticated():
- patches_per_page = request.user.get_profile().patches_per_page
+ patches_per_page = request.user.profile.patches_per_page
n = request.META.get('ppp')
if n:
diff --git a/apps/patchwork/tests/test_bundles.py b/apps/patchwork/tests/test_bundles.py
index 5e8b95b..38f3a2c 100644
--- a/apps/patchwork/tests/test_bundles.py
+++ b/apps/patchwork/tests/test_bundles.py
@@ -193,7 +193,7 @@ class BundleMaintainerUpdateTest(BundleUpdateTest):
def setUp(self):
super(BundleMaintainerUpdateTest, self).setUp()
- profile = self.user.get_profile()
+ profile = self.user.profile
profile.maintainer_projects.add(defaults.project)
profile.save()
diff --git a/apps/patchwork/tests/utils.py b/apps/patchwork/tests/utils.py
index c36b6c1..782ed36 100644
--- a/apps/patchwork/tests/utils.py
+++ b/apps/patchwork/tests/utils.py
@@ -79,7 +79,7 @@ def create_user():
def create_maintainer(project):
user = create_user()
- profile = user.get_profile()
+ profile = user.profile
profile.maintainer_projects.add(project)
profile.save()
return user
diff --git a/apps/patchwork/views/user.py b/apps/patchwork/views/user.py
index a9d6c4c..126ecc9 100644
--- a/apps/patchwork/views/user.py
+++ b/apps/patchwork/views/user.py
@@ -86,7 +86,7 @@ def register_confirm(request, conf):
person = Person.objects.get(email__iexact = conf.user.email)
except Person.DoesNotExist:
person = Person(email = conf.user.email,
- name = conf.user.get_profile().name())
+ name = conf.user.profile.name())
person.user = conf.user
person.save()
@@ -97,14 +97,14 @@ def profile(request):
context = PatchworkRequestContext(request)
if request.method == 'POST':
- form = UserProfileForm(instance = request.user.get_profile(),
+ form = UserProfileForm(instance = request.user.profile,
data = request.POST)
if form.is_valid():
form.save()
else:
- form = UserProfileForm(instance = request.user.get_profile())
+ form = UserProfileForm(instance = request.user.profile)
- context.project = request.user.get_profile().primary_project
+ context.project = request.user.profile.primary_project
context['bundles'] = Bundle.objects.filter(owner = request.user)
context['profileform'] = form
@@ -184,7 +184,7 @@ def todo_lists(request):
todo_lists = []
for project in Project.objects.all():
- patches = request.user.get_profile().todo_patches(project = project)
+ patches = request.user.profile.todo_patches(project = project)
if not patches.count():
continue
@@ -195,13 +195,13 @@ def todo_lists(request):
context = PatchworkRequestContext(request)
context['todo_lists'] = todo_lists
- context.project = request.user.get_profile().primary_project
+ context.project = request.user.profile.primary_project
return render_to_response('patchwork/todo-lists.html', context)
@login_required
def todo_list(request, project_id):
project = get_object_or_404(Project, linkname = project_id)
- patches = request.user.get_profile().todo_patches(project = project)
+ patches = request.user.profile.todo_patches(project = project)
filter_settings = [(DelegateFilter,
{'delegate': request.user})]
diff --git a/apps/settings.py b/apps/settings.py
index e663c48..379fbc5 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -86,8 +86,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.i18n",
"django.core.context_processors.media")
-AUTH_PROFILE_MODULE = "patchwork.userprofile"
-
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
--
1.9.3
More information about the Patchwork
mailing list