Merge lp:~methanal-developers/methanal/1311615-tabview-async-content-factories into lp:methanal

[Jonathan Jacobs]

=== modified file 'methanal/widgets.py'
--- methanal/widgets.py	2014-03-14 13:48:19 +0000
+++ methanal/widgets.py	2014-04-23 11:39:44 +0000
@@ -1034,9 +1034,12 @@
 
     @expose
     def getContent(self, nodeID=None):
-        content = self.contentFactory()
-        content.setFragmentParent(self)
-        return content
+        def _setFragmentParent(content):
+            content.setFragmentParent(self)
+            return content
+        d = maybeDeferred(self.contentFactory)
+        d.addCallback(_setFragmentParent)
+        return d
 
 
     @renderer
@@ -1066,7 +1069,9 @@
 
     @renderer
     def tabContent(self, req, tag):
-        return tag[self.getContent()]
+        d = self.getContent()
+        d.addCallback(tag.__getitem__)
+        return d
 
 
     def updateRemoteContent(self):
@@ -1100,8 +1105,12 @@
         """
         Force the remote content to be updated.
         """
-        return self.callRemote(
-            'setContentFromWidgetInfo', self.getContent(), u'content')
+        def _callRemote(content):
+            return self.callRemote(
+                'setContentFromWidgetInfo', content, u'content')
+        d = self.getContent()
+        d.addCallback(_callRemote)
+        return d