From 41607c0b56c609af07e15fda9a91a863fc79020a Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Sat, 26 Jan 2013 17:04:15 -0800
Subject: [PATCH] Resolve duplication between two pull requests for
 Choices.__len__.

---
 model_utils/__init__.py    | 3 ---
 model_utils/tests/tests.py | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/model_utils/__init__.py b/model_utils/__init__.py
index 543a153..0a235ef 100644
--- a/model_utils/__init__.py
+++ b/model_utils/__init__.py
@@ -133,9 +133,6 @@ class Choices(object):
     def __getitem__(self, index):
         return self._choices[index]
 
-    def __len__(self):
-        return len(self._choices)
-
     def __repr__(self):
         return '%s(%s)' % (self.__class__.__name__,
                           ', '.join(("%s" % str(i) for i in self._full)))
diff --git a/model_utils/tests/tests.py b/model_utils/tests/tests.py
index 5cf8efe..ce0d4e8 100644
--- a/model_utils/tests/tests.py
+++ b/model_utils/tests/tests.py
@@ -197,9 +197,6 @@ class ChoicesTests(TestCase):
     def test_wrong_length_tuple(self):
         self.assertRaises(ValueError, Choices, ('a',))
 
-    def test_len(self):
-        self.assertEquals(len(self.STATUS), len(self.STATUS._choices))
-
 
 
 class LabelChoicesTests(ChoicesTests):
@@ -655,6 +652,7 @@ class PassThroughManagerTests(TestCase):
         unqs = pickle.loads(saltyqs)
         self.assertEqual(unqs.by_name('The Dude').count(), 1)
 
+
     def test_queryset_not_available_on_related_manager(self):
         dude = Dude.objects.by_name('Duder').get()
         Car.objects.create(name='Ford', owner=dude)