From 3fa18349860c969298131452324c7fe1a955a35f Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Fri, 20 Dec 2013 12:13:02 +0000 Subject: [PATCH] Remove Person.objects.by_username/by_email for now - they aren't actually in use, the email one looks suspicious in that it takes the email from the User object, and the username one does not seem generally useful; also remove the unit tests of these two which was relying on an incomplete fixture - Legacy-Id: 7029 --- ietf/person/models.py | 15 --------------- ietf/person/tests/__init__.py | 1 - ietf/person/tests/persons.py | 25 ------------------------- 3 files changed, 41 deletions(-) delete mode 100644 ietf/person/tests/__init__.py delete mode 100644 ietf/person/tests/persons.py diff --git a/ietf/person/models.py b/ietf/person/models.py index 62530ccb7..02b17bc1c 100644 --- a/ietf/person/models.py +++ b/ietf/person/models.py @@ -72,22 +72,7 @@ class PersonInfo(models.Model): class Meta: abstract = True -class PersonManager(models.Manager): - def by_email(self, email): - results = self.get_query_set().filter(user__email = email) - if len(results)>0: - return results[0] - else: - return None - def by_username(self, username): - results = self.get_query_set().filter(user__username = username) - if len(results)>0: - return results[0] - else: - return None - class Person(PersonInfo): - objects = PersonManager() user = models.OneToOneField(User, blank=True, null=True) #this variable, if not None, may be used by url() to keep the sitefqdn. diff --git a/ietf/person/tests/__init__.py b/ietf/person/tests/__init__.py deleted file mode 100644 index e5c885996..000000000 --- a/ietf/person/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from persons import PersonFetchTestCase diff --git a/ietf/person/tests/persons.py b/ietf/person/tests/persons.py deleted file mode 100644 index e3a0b4580..000000000 --- a/ietf/person/tests/persons.py +++ /dev/null @@ -1,25 +0,0 @@ -import sys -from ietf.utils import TestCase -from ietf.group.models import Group -from ietf.person.models import Person - -class PersonFetchTestCase(TestCase): - # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures - perma_fixtures = [ 'persons'] - - def test_FindNoPerson(self): - one = Person.objects.by_email('wlo@amsl.org') - self.assertEqual(one, None) - - def test_FindOnePerson(self): - one = Person.objects.by_email('wlo@amsl.com') - self.assertNotEqual(one, None) - - def test_FindOnePersonByUsername(self): - one = Person.objects.by_username('wnl') - self.assertNotEqual(one, None) - - - - -