# HG changeset patch
# User KarstenBock@gmx.net
# Date 1313003294 -7200
# Node ID 16c959864d418851e372ac137a621bcea7ccdc57
# Parent  702ee8e475df6b99c9cab3b64cac5e91386add40
Backed out changeset: 799fc37fec6d

diff -r 702ee8e475df -r 16c959864d41 components/containable.py
--- a/components/containable.py	Wed Aug 10 21:07:06 2011 +0200
+++ b/components/containable.py	Wed Aug 10 21:08:14 2011 +0200
@@ -18,7 +18,4 @@
     
     def __init__(self):
         """Constructor"""
-        Component.__init__(bulk=int, weight=int, image=str, current_container=object, new_container=object, new_slot=int)
-        self.fields['current_container'].default = None
-        self.fields['new_container'].default = None
-        self.fields['new_slot'].default = -1
+        Component.__init__(bulk=int, weight=int, image=str, container=object)
diff -r 702ee8e475df -r 16c959864d41 components/container.py
--- a/components/container.py	Wed Aug 10 21:07:06 2011 +0200
+++ b/components/container.py	Wed Aug 10 21:08:14 2011 +0200
@@ -20,9 +20,3 @@
     
     def __init__(self):
         Component.__init__(children=list, max_bulk=int)
-        
-def get_bulk(container):
-    bulk = 0
-    for child in container.children:
-        bulk += child.bulk
-    return bulk