Ticket #13593: Python_Replace_deprecated_settings.patch

mythtv/bindings/python/MythTV/database.py

@@ -1360 +1360 @@
         return self.dbconfig.profile
 
     def getMasterBackend(self):
-        return self._gethostfromaddr(self.settings.NULL.MasterServerIP)
+        return self.settings.NULL.MasterServerName
 
     def getStorageGroup(self, groupname=None, hostname=None):
         """

mythtv/bindings/python/MythTV/methodheap.py

@@ -1142 +1142 @@
         self.log = MythLog('Python XML Connection')
         if backend is None:
             # use master backend
-            backend = self.db.settings.NULL.MasterServerIP
-        if re.match(r'(?:\d{1,3}\.){3}\d{1,3}',backend) or \
+            backendname = self.db.settings.NULL.MasterServerName
+            self.host = self.db.settings[backendname].BackendServerAddr
+            self.port = int(self.db.settings[backendname].BackendStatusPort)
+        elif re.match(r'(?:\d{1,3}\.){3}\d{1,3}',backend) or \
                     check_ipv6(backend):
             # process ip address
-            host = self.db._gethostfromaddr(backend)
+            host = self.db._gethostfromaddr(backend, 'BackendServerAddr')
             self.host = backend
             self.port = int(self.db.settings[host].BackendStatusPort)
         else:
-            # assume given a hostname
-            self.host = backend
-            self.port = int(self.db.settings[self.host].BackendStatusPort)
-            if not self.port:
+            # assume given a canonical host address
+            try:
+                host = self.db._gethostfromaddr(backend, 'BackendServerAddr')
+                self.host = backend
+                self.port = int(self.db.settings[host].BackendStatusPort)
+            except MythDBError:
                 # try a truncated hostname
-                self.host = backend.split('.')[0]
-                self.port = int(self.db.setting[self.host].BackendStatusPort)
+                host = backend.split('.')[0]
+                self.host = self.db._getpreferredaddr(host)
+                if not self.host:
+                    raise MythDBError(MythError.DB_SETTING,
+                                        backend+': BackendServerAddr')
+                self.port = int(self.db.settings[host].BackendStatusPort)
                 if not self.port:
                     raise MythDBError(MythError.DB_SETTING,
                                         backend+': BackendStatusPort')

mythtv/bindings/python/MythTV/mythproto.py

@@ -76 +76 @@
 
         if backend is None:
             # no backend given, use master
-            self.host = self.db.settings.NULL.MasterServerIP
-            self.hostname = self.db._gethostfromaddr(self.host)
-
+            self.hostname = self.db.settings.NULL.MasterServerName
+            self.host = self.db._getpreferredaddr(self.hostname)
         else:
             backend = backend.strip('[]')
             if self._reip.match(backend):
@@ -95 +94 @@
                 # given backend is hostname, pull address from database
                 self.hostname = backend
                 self.host = self.db._getpreferredaddr(backend)
+                if not self.host:
+                    # given backend is canonical name, use it as ip address
+                    self.host = backend
+                    self.hostname = self.db._gethostfromaddr(
+                                            backend, 'BackendServerAddr')
 
         # lookup port from database
         self.port = int(self.db.settings[self.hostname].BackendServerPort)