Changeset 11410

Timestamp:

Mar 22, 2012, 9:15:22 PM (8 years ago)

Author:

osimons

Message:

XmlRpcPlugin: Small fix + test to gracefully handle running Python optimized (-OO) that may in fact strip all docstrings (leaving them as None). Fixes #9919.

Running python -OO setup.py test will now at least fail this new test that depends on ability to introspect docstrings.

Location:

xmlrpcplugin/trunk/tracrpc

Files:

• tests/api.py (modified) (1 diff)
• util.py (modified) (1 diff)

xmlrpcplugin/trunk/tracrpc/tests/api.py

@@ -37 +37 @@
             self.assertEquals(e.fp.read(),
                 "No protocol matching Content-Type 'text/plain' at path '/rpc'.")
+
+    def test_rpc_info(self):
+        # Just try getting the docs for XML-RPC to test, it should always exist
+        from tracrpc.xml_rpc import XmlRpcProtocol
+        xmlrpc = XmlRpcProtocol(rpc_testenv.get_trac_environment())
+        name, docs = xmlrpc.rpc_info()
+        self.assertEquals(name, 'XML-RPC')
+        self.assertTrue('Content-Type: application/xml' in docs)
 
     def test_valid_provider(self):

xmlrpcplugin/trunk/tracrpc/util.py

@@ -47 +47 @@
 def prepare_docs(text, indent=4):
     r"""Remove leading whitespace"""
-    return ''.join(l[indent:] for l in text.splitlines(True))
+    return text and ''.join(l[indent:] for l in text.splitlines(True)) or ''
 
 try: