r47095 - Apply path.diff.

Author: adiroiban
Date: Mon Mar 28 02:07:03 2016
New Revision: 47095

Added:
   branches/names-server-py3-8195-2/twisted/names/topfiles/8195.feature
Modified:
   branches/names-server-py3-8195-2/twisted/names/server.py
   branches/names-server-py3-8195-2/twisted/names/test/test_server.py
   branches/names-server-py3-8195-2/twisted/python/dist3.py

Log:
Apply path.diff.

Modified: branches/names-server-py3-8195-2/twisted/names/server.py
==============================================================================
--- branches/names-server-py3-8195-2/twisted/names/server.py	(original)
+++ branches/names-server-py3-8195-2/twisted/names/server.py	Mon Mar 28 02:07:03 2016
@@ -16,6 +16,7 @@
 
 @author: Jp Calderone
 """
+from __future__ import division, absolute_import
 
 import time
 
@@ -260,7 +261,7 @@
         return response
 
 
-    def gotResolverResponse(self, (ans, auth, add), protocol, message, address):
+    def gotResolverResponse(self, ans_auth_add, protocol, message, address):
         """
         A callback used by L{DNSServerFactory.handleQuery} for handling the
         deferred response from C{self.resolver.query}.
@@ -274,14 +275,8 @@
         The resolved answers count will be logged if C{DNSServerFactory.verbose}
         is C{>1}.
 
-        @param ans: A list of answer records
-        @type ans: L{list} of L{dns.RRHeader} instances
-
-        @param auth: A list of authority records
-        @type auth: L{list} of L{dns.RRHeader} instances
-
-        @param add: A list of additional records
-        @type add: L{list} of L{dns.RRHeader} instances
+        @param ans_auth_add: Answer records, authority records and additional records
+        @type ans_auth_add: L{tuple} of L{list} of L{dns.RRHeader} instances
 
         @param protocol: The DNS protocol instance to which to send a response
             message.
@@ -295,6 +290,7 @@
             or L{None} if C{protocol} is a stream protocol.
         @type address: L{tuple} or L{None}
         """
+        ans, auth, add = ans_auth_add
         response = self._responseFromMessage(
             message=message, rCode=dns.OK,
             answers=ans, authority=auth, additional=add)

Modified: branches/names-server-py3-8195-2/twisted/names/test/test_server.py
==============================================================================
--- branches/names-server-py3-8195-2/twisted/names/test/test_server.py	(original)
+++ branches/names-server-py3-8195-2/twisted/names/test/test_server.py	Mon Mar 28 02:07:03 2016
@@ -4,6 +4,7 @@
 """
 Test cases for L{twisted.names.server}.
 """
+from __future__ import division, absolute_import
 
 from zope.interface.verify import verifyClass
 

Modified: branches/names-server-py3-8195-2/twisted/python/dist3.py
==============================================================================
--- branches/names-server-py3-8195-2/twisted/python/dist3.py	(original)
+++ branches/names-server-py3-8195-2/twisted/python/dist3.py	Mon Mar 28 02:07:03 2016
@@ -130,6 +130,7 @@
     "twisted.names.dns",
     "twisted.names.error",
     "twisted.names.hosts",
+    "twisted.names.server",
     "twisted.names.resolve",
     "twisted.names.test.__init__",
     "twisted.persisted.__init__",
@@ -315,6 +316,7 @@
     "twisted.names.test.test_hosts",
     "twisted.names.test.test_rfc1982",
     "twisted.names.test.test_util",
+    "twisted.names.test_server",
     "twisted.persisted.test.test_styles",
     "twisted.positioning.test.test_base",
     "twisted.positioning.test.test_nmea",