Skip to content

Commit

Permalink
Get rid of deprecated use_for_related_fields manager attribute
Browse files Browse the repository at this point in the history
Use Meta.base_manager_name on models instead.
  • Loading branch information
ta2-1 committed Jan 20, 2017
1 parent 68e72e4 commit 5a1bdfa
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-01-20 07:49
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('pootle_app', '0017_drop_stray_directories'),
]

operations = [
migrations.AlterModelOptions(
name='directory',
options={'base_manager_name': 'objects', 'default_permissions': (), 'ordering': ['name']},
),
]
2 changes: 1 addition & 1 deletion pootle/apps/pootle_app/models/directory.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@


class DirectoryManager(models.Manager):
use_for_related_fields = True

def live(self):
"""Filters non-obsolete directories."""
Expand Down Expand Up @@ -82,6 +81,7 @@ class Meta(object):
index_together = [
["obsolete", "pootle_path"],
["obsolete", "tp", "tp_path"]]
base_manager_name = "objects"

@cached_property
def data_tool(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-01-20 08:21
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('pootle_statistics', '0005_index_ordering'),
]

operations = [
migrations.AlterModelOptions(
name='submission',
options={'base_manager_name': 'objects', 'get_latest_by': 'creation_time', 'ordering': ['creation_time', 'pk']},
),
]
3 changes: 1 addition & 2 deletions pootle/apps/pootle_statistics/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ def latest(self, field_name=None):

class SubmissionManager(models.Manager):

use_for_related_fields = True

def get_queryset(self):
return SubmissionQuerySet(self.model, using=self._db)

Expand Down Expand Up @@ -163,6 +161,7 @@ class Meta(object):
index_together = ["submitter", "creation_time", "id"]
get_latest_by = "creation_time"
db_table = 'pootle_app_submission'
base_manager_name = 'objects'

objects = SubmissionManager()

Expand Down
1 change: 0 additions & 1 deletion pootle/apps/pootle_store/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ def get_translatable(self, user, project_code=None, language_code=None,


class StoreManager(models.Manager):
use_for_related_fields = True

def live(self):
"""Filters non-obsolete stores."""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-01-20 07:49
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('pootle_store', '0023_add_unit_store_idxs'),
]

operations = [
migrations.AlterModelOptions(
name='store',
options={'base_manager_name': 'objects', 'ordering': ['pootle_path']},
),
]
1 change: 1 addition & 0 deletions pootle/apps/pootle_store/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,7 @@ class Meta(object):
unique_together = (
('parent', 'name'),
("obsolete", "translation_project", "tp_path"))
base_manager_name = "objects"

# # # # # # # # # # # # # # Properties # # # # # # # # # # # # # # # # # #

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-01-20 07:49
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('pootle_translationproject', '0006_relink_or_drop_orphan_translationprojects'),
]

operations = [
migrations.AlterModelOptions(
name='translationproject',
options={'base_manager_name': 'objects'},
),
]
4 changes: 2 additions & 2 deletions pootle/apps/pootle_translationproject/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ def scan_translation_projects(languages=None, projects=None):


class TranslationProjectManager(models.Manager):
# disabled objects are hidden for related objects too
use_for_related_fields = True

def get_terminology_project(self, language_id):
# FIXME: the code below currently uses the same approach to determine
Expand Down Expand Up @@ -163,6 +161,8 @@ class Meta(object):
('language', 'project'),
('project', 'language'))
db_table = 'pootle_app_translationproject'
# disabled objects are hidden for related objects too
base_manager_name = 'objects'

@cached_property
def code(self):
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ filterwarnings =
#
# Sadly can't use RemovedInDjango20Warning directly
# Not Clean
default:.*use_for_related_fields.*
#
# Clean
default:.*assignment_tag.*::.*socialaccount
## Other
Expand Down

0 comments on commit 5a1bdfa

Please sign in to comment.