[Python-3000-checkins] r59454 - in python/branches/py3k/Lib: DocXMLRPCServer.py test/test_docxmlrpc.py
christian.heimes
python-3000-checkins at python.org
Mon Dec 10 21:18:08 CET 2007
Author: christian.heimes
Date: Mon Dec 10 21:18:07 2007
New Revision: 59454
Modified:
python/branches/py3k/Lib/DocXMLRPCServer.py
python/branches/py3k/Lib/test/test_docxmlrpc.py
Log:
Fixed doc xml rpc tests and server
Modified: python/branches/py3k/Lib/DocXMLRPCServer.py
==============================================================================
--- python/branches/py3k/Lib/DocXMLRPCServer.py (original)
+++ python/branches/py3k/Lib/DocXMLRPCServer.py Mon Dec 10 21:18:07 2007
@@ -123,12 +123,12 @@
result = result + '<p>%s</p>\n' % doc
contents = []
- method_items = methods.items()
+ method_items = list(methods.items())
method_items.sort()
for key, value in method_items:
contents.append(self.docroutine(value, key, funcs=fdict))
result = result + self.bigsection(
- 'Methods', '#ffffff', '#eeaa77', pydoc.join(contents))
+ 'Methods', '#ffffff', '#eeaa77', ''.join(contents))
return result
@@ -239,7 +239,7 @@
self.send_header("Content-type", "text/html")
self.send_header("Content-length", str(len(response)))
self.end_headers()
- self.wfile.write(response)
+ self.wfile.write(response.encode())
# shut down the connection
self.wfile.flush()
Modified: python/branches/py3k/Lib/test/test_docxmlrpc.py
==============================================================================
--- python/branches/py3k/Lib/test/test_docxmlrpc.py (original)
+++ python/branches/py3k/Lib/test/test_docxmlrpc.py Mon Dec 10 21:18:07 2007
@@ -106,7 +106,7 @@
response = self.client.getresponse()
self.assert_(
-"""<dl><dt><a name="-<lambda>"><strong><lambda></strong></a>(x, y)</dt></dl>"""
+b"""<dl><dt><a name="-<lambda>"><strong><lambda></strong></a>(x, y)</dt></dl>"""
in response.read())
def test_autolinking(self):
@@ -120,7 +120,7 @@
response = self.client.getresponse()
self.assert_( # This is ugly ... how can it be made better?
-"""<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd><tt>Add two instances together. This follows <a href="http://www.python.org/peps/pep-0008.html">PEP008</a>, but has nothing<br>\nto do with <a href="http://www.rfc-editor.org/rfc/rfc1952.txt">RFC1952</a>. Case should matter: pEp008 and rFC1952. Things<br>\nthat start with http and ftp should be auto-linked, too:<br>\n<a href="http://google.com">http://google.com</a>.</tt></dd></dl>"""
+b"""<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd><tt>Add two instances together. This follows <a href="http://www.python.org/peps/pep-0008.html">PEP008</a>, but has nothing<br>\nto do with <a href="http://www.rfc-editor.org/rfc/rfc1952.txt">RFC1952</a>. Case should matter: pEp008 and rFC1952. Things<br>\nthat start with http and ftp should be auto-linked, too:<br>\n<a href="http://google.com">http://google.com</a>.</tt></dd></dl>"""
in response.read())
def test_system_methods(self):
@@ -130,11 +130,10 @@
related to that process.
"""
self.client.request("GET", "/")
- response = self.client.getresponse()
+ response = self.client.getresponse().read()
self.assert_(
-"""<dl><dt><a name="-system.listMethods"><strong>system.listMethods</strong></a>()</dt><dd><tt><a href="#-system.listMethods">system.listMethods</a>() => [\'add\', \'subtract\', \'multiple\']<br>\n <br>\nReturns a list of the methods supported by the server.</tt></dd></dl>\n <dl><dt><a name="-system.methodHelp"><strong>system.methodHelp</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodHelp">system.methodHelp</a>(\'add\') => "Adds two integers together"<br>\n <br>\nReturns a string containing documentation for the specified method.</tt></dd></dl>\n <dl><dt><a name="-system.methodSignature"><strong>system.methodSignature</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodSignature">system.methodSignature</a>(\'add\') => [double, int, int]<br>\n <br>\nReturns a list describing the signature of the method. In the<br>\nabove example, the add method takes two integers as arguments<br>\nand returns a double result.<br>\n <br>\nThis server does NOT support system.methodSignature.</tt></dd></dl>"""
- in response.read())
+b"""<dl><dt><a name="-system.methodHelp"><strong>system.methodHelp</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodHelp">system.methodHelp</a>(\'add\') => "Adds two integers together"<br>\n <br>\nReturns a string containing documentation for the specified method.</tt></dd></dl>\n<dl><dt><a name="-system.methodSignature"><strong>system.methodSignature</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodSignature">system.methodSignature</a>(\'add\') => [double, int, int]<br>\n <br>\nReturns a list describing the signature of the method. In the<br>\nabove example, the add method takes two integers as arguments<br>\nand returns a double result.<br>\n <br>\nThis server does NOT support system.methodSignature.</tt></dd></dl>\n<dl><dt><a name="-test_method"><strong>test_method</strong></a>(arg)</dt><dd><tt>Test method\'s docs. This method truly does very little.</tt></dd></dl>""" in response)
def test_autolink_dotted_methods(self):
"""Test that selfdot values are made strong automatically in the
@@ -142,7 +141,7 @@
self.client.request("GET", "/")
response = self.client.getresponse()
- self.assert_("""Try self.<strong>add</strong>, too.""" in
+ self.assert_(b"""Try self.<strong>add</strong>, too.""" in
response.read())
def test_main():
More information about the Python-3000-checkins
mailing list