From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 4 Jun 2013 00:28:37 +0000 (-0700)
Subject: [2964] (unrelated) cleanup: removed the check for pydnspp module.
X-Git-Tag: bind10-1.2.0beta1-release~423^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f24dff697d824255a76586d0ff879e8445087d08;p=thirdparty%2Fkea.git

[2964] (unrelated) cleanup: removed the check for pydnspp module.

it doesn't make sense in practice and should better be cleaned up.
---

diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index 04bd141702..bfcbdcb584 100644
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -1005,7 +1005,7 @@ class TestAXFR(TestXfrinConnection):
         def message_has_tsig(data):
             # a simple check if the actual data contains a TSIG RR.
             # At our level this simple check should suffice; other detailed
-            # tests regarding the TSIG protocol are done in pydnspp.
+            # tests regarding the TSIG protocol are done in the isc.dns module.
             msg = Message(Message.PARSE)
             msg.from_wire(data)
             return msg.get_tsig_record() is not None
@@ -2644,14 +2644,6 @@ class TestXfrin(unittest.TestCase):
         self.assertEqual(self.xfr.command_handler("retransfer",
                                                   self.args)['result'][0], 1)
 
-    def test_command_handler_retransfer_nomodule(self):
-        dns_module = sys.modules['pydnspp'] # this must exist
-        del sys.modules['pydnspp']
-        self.assertEqual(self.xfr.command_handler("retransfer",
-                                                  self.args)['result'][0], 1)
-        # sys.modules is global, so we must recover it
-        sys.modules['pydnspp'] = dns_module
-
     def test_command_handler_retransfer_datasrc_error(self):
         # Failure cases due to various errors at the data source (config/data)
         # level
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index dd8dc94143..bc208f8d4a 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1708,11 +1708,6 @@ class Xfrin:
 
     def xfrin_start(self, zone_name, rrclass, master_addrinfo, tsig_key,
                     request_ixfr, check_soa=True):
-        if "pydnspp" not in sys.modules:
-            return (1,
-                    "xfrin failed, can't load dns message python library: " +
-                    "'pydnspp'")
-
         # check max_transfer_in, else return quota error
         if self.recorder.count() >= self._max_transfers_in:
             return (1, 'xfrin quota error')