summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-12-08 18:14:49 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2013-12-08 18:14:49 +0200
commit3e60a9d602c85b738dc74a3c8a196650822e8619 (patch)
tree0c21357fd386696b3dbe8ef4ea1dde284c5ccd14
parenta82f74dee35cb2d433fdf86e48ea6f5cd45b6ded (diff)
downloadcpython-git-3e60a9d602c85b738dc74a3c8a196650822e8619.tar.gz
Issue #19535: Fixed test_docxmlrpc when python is run with -OO.
-rw-r--r--Lib/test/test_docxmlrpc.py6
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
index 7086d9a6a1..cb6366c7d5 100644
--- a/Lib/test/test_docxmlrpc.py
+++ b/Lib/test/test_docxmlrpc.py
@@ -202,10 +202,12 @@ class DocXMLRPCHTTPGETServer(unittest.TestCase):
""" Test that annotations works as expected """
self.client.request("GET", "/")
response = self.client.getresponse()
+ docstring = (b'' if sys.flags.optimize >= 2 else
+ b'<dd><tt>Use&nbsp;function&nbsp;annotations.</tt></dd>')
self.assertIn(
(b'<dl><dt><a name="-annotation"><strong>annotation</strong></a>'
- b'(x: int)</dt><dd><tt>Use&nbsp;function&nbsp;annotations.</tt>'
- b'</dd></dl>\n<dl><dt><a name="-method_annotation"><strong>'
+ b'(x: int)</dt>' + docstring + b'</dl>\n'
+ b'<dl><dt><a name="-method_annotation"><strong>'
b'method_annotation</strong></a>(x: bytes)</dt></dl>'),
response.read())
diff --git a/Misc/NEWS b/Misc/NEWS
index 5a760ba625..0eac7fb2ad 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -97,6 +97,8 @@ Library
Tests
-----
+- Issue #19535: Fixed test_docxmlrpc when python is run with -OO.
+
- Issue #19926: Removed unneeded test_main from test_abstract_numbers.
Patch by Vajrasky Kok.