From 01398758f8fd83b91e3d7634a37d862a6ad19b34 Mon Sep 17 00:00:00 2001 From: bbangert Date: Mon, 8 Oct 2007 18:33:28 +0000 Subject: Replace and register are identical, aliasing the method. --- paste/registry.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'paste') diff --git a/paste/registry.py b/paste/registry.py index 216f99a..685caae 100644 --- a/paste/registry.py +++ b/paste/registry.py @@ -292,27 +292,15 @@ class Registry(object): """Register an object with a StackedObjectProxy""" myreglist = self.reglist[-1] stacked_id = id(stacked) - if stacked_id in myreglist: - stacked._pop_object(myreglist[stacked_id]) - del myreglist[stacked_id] - stacked._push_object(obj) - myreglist[stacked_id] = (stacked, obj) - - def replace(self, stacked, obj): - """Replace the object referenced by a StackedObjectProxy with a - different object - - In the event that no object has been registered, the new object will - be registered. - """ - myreglist = self.reglist[-1] - stacked_id = id(stacked) if stacked_id in myreglist: stacked._pop_object(myreglist[stacked_id][1]) del myreglist[stacked_id] stacked._push_object(obj) myreglist[stacked_id] = (stacked, obj) + # Replace now does the same thing as register + replace = register + def cleanup(self): """Remove all objects from all StackedObjectProxy instances that were tracked at this Registry context""" -- cgit v1.2.1