diff options
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | docs/api/location.rst | 2 | ||||
| -rw-r--r-- | repoze/bfg/location.py | 10 | ||||
| -rw-r--r-- | repoze/bfg/tests/test_location.py | 40 |
4 files changed, 23 insertions, 35 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 9215bfed1..db13f4fa6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -13,6 +13,12 @@ Documentation - Fix a reference to ``wsgiapp`` in the ``wsgiapp2`` API documentation within the ``repoze.bfg.wsgi`` module. +API Removals +------------ + +- The ``repoze.bfg.location.locate`` API was removed: it didn't do + enough to be very helpful and had a misleading name. + 0.9 (2009-06-01) ================ diff --git a/docs/api/location.rst b/docs/api/location.rst index dc7d50a2f..b2625f49c 100644 --- a/docs/api/location.rst +++ b/docs/api/location.rst @@ -9,6 +9,4 @@ .. autofunction:: inside - .. autofunction:: locate - diff --git a/repoze/bfg/location.py b/repoze/bfg/location.py index 7e9d622c2..adb01d129 100644 --- a/repoze/bfg/location.py +++ b/repoze/bfg/location.py @@ -32,16 +32,6 @@ def inside(model1, model2): return False -def locate(model, parent, name=None): - """ - Directly set ``model`` 's ``__parent__`` attribute to the - ``parent`` object (also a model), and its ``__name__`` to the - supplied ``name`` argument, and return the model. - """ - model.__parent__ = parent - model.__name__ = name - return model - def lineage(model): """ Return a generator representing the model lineage. The generator diff --git a/repoze/bfg/tests/test_location.py b/repoze/bfg/tests/test_location.py index 9de059a86..9b8360f8b 100644 --- a/repoze/bfg/tests/test_location.py +++ b/repoze/bfg/tests/test_location.py @@ -1,42 +1,36 @@ import unittest -class TestLocation(unittest.TestCase): +class TestInside(unittest.TestCase): + def _callFUT(self, one, two): + from repoze.bfg.location import inside + return inside(one, two) + def test_inside(self): o1 = Location() o2 = Location(); o2.__parent__ = o1 o3 = Location(); o3.__parent__ = o2 o4 = Location(); o4.__parent__ = o3 - from repoze.bfg.location import inside - self.assertEqual(inside(o1, o1), True) - self.assertEqual(inside(o2, o1), True) - self.assertEqual(inside(o3, o1), True) - self.assertEqual(inside(o4, o1), True) - self.assertEqual(inside(o1, o4), False) - self.assertEqual(inside(o1, None), False) - - def test_locate(self): - from repoze.bfg.location import locate - a = Location() - parent = Location() - a_located = locate(a, parent, 'a') - self.failUnless(a_located is a) - self.failUnless(a_located.__parent__ is parent) - self.assertEqual(a_located.__name__, 'a') - # If we locate the object again, nothing special happens: + self.assertEqual(self._callFUT(o1, o1), True) + self.assertEqual(self._callFUT(o2, o1), True) + self.assertEqual(self._callFUT(o3, o1), True) + self.assertEqual(self._callFUT(o4, o1), True) + self.assertEqual(self._callFUT(o1, o4), False) + self.assertEqual(self._callFUT(o1, None), False) - a_located_2 = locate(a_located, parent, 'a') - self.failUnless(a_located_2 is a_located) +class TestLineage(unittest.TestCase): + def _callFUT(self, context): + from repoze.bfg.location import lineage + return lineage(context) def test_lineage(self): - from repoze.bfg.location import lineage o1 = Location() o2 = Location(); o2.__parent__ = o1 o3 = Location(); o3.__parent__ = o2 o4 = Location(); o4.__parent__ = o3 - result = list(lineage(o3)) + result = list(self._callFUT(o3)) self.assertEqual(result, [o3, o2, o1]) - result = list(lineage(o1)) + result = list(self._callFUT(o1)) self.assertEqual(result, [o1]) from repoze.bfg.interfaces import ILocation |