Force proper initialization of keys and jumppoints for control socket.

MythTV · May 27, 2012 · 931fe9c · 931fe9c
1 parent c77d8ed
commit 931fe9c
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/mythtv/bindings/python/MythTV/methodheap.py b/mythtv/bindings/python/MythTV/methodheap.py
@@ -8,7 +8,7 @@
 from MythTV.exceptions import *
 from MythTV.logging import MythLog
 from MythTV.connections import FEConnection, XMLConnection, BEEventConnection
-from MythTV.utility import databaseSearch, datetime, check_ipv6
+from MythTV.utility import databaseSearch, datetime, check_ipv6, _donothing
 from MythTV.database import DBCache, DBData
 from MythTV.system import SystemEvent
 from MythTV.mythproto import BECache, FileOps, Program, FreeSpace, EventLock
@@ -489,13 +489,11 @@ def __repr__(self): return str(self)
 
         def __init__(self, parent):
             self._parent = proxy(parent)
-            self._populated = False
             self._points = {}
 
         def _populate(self):
-            if not self._populated:
+            self._populate = _donothing
-                self._points = dict(self._parent.send('jump'))
+            self._points = dict(self._parent.send('jump'))
-                self._populated = True
 
         def __getitem__(self, key):
             self._populate()
@@ -505,6 +503,7 @@ def __getitem__(self, key):
                 return False
 
         def __getattr__(self, key):
+            self._populate()
             if key in self.__dict__:
                 return self.__dict__[key]
             return self.__getitem__(key)
@@ -534,13 +533,11 @@ def __repr__(self): return str(self)
 
         def __init__(self, parent):
             self._parent = proxy(parent)
-            self._populated = False
             self._keys = []
 
         def _populate(self):
-            if not self._populated:
+            self._populate = _donothing
-                self._keys = self._parent.send('key')
+            self._keys = self._parent.send('key')
-                self._populated = True
 
         def _sendLiteral(self, key):
             if (key in self._keys) or (key in self._alnum):
@@ -568,6 +565,7 @@ def __getitem__(self, key):
                 return False
 
         def __getattr__(self, key):
+            self._populate()
             if key in self.__dict__:
                 return self.__dict__[key]
             return self._sendLiteral(key)