traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.5

This commit is contained in:
Serhiy Storchaka 2016-04-24 23:53:16 +03:00
parent e4fbb0206d 5b6f0aa71c
commit fd2839e1de
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_pyexpat.py
View File

@ -42,12 +42,6 @@ class SetAttributeTest(unittest.TestCase):
self.parser.specified_attributes = x self.parser.specified_attributes = x
self.assertIs(self.parser.specified_attributes, bool(x)) self.assertIs(self.parser.specified_attributes, bool(x))
def test_specified_attributes(self):
self.assertIs(self.parser.specified_attributes, False)
for x in 0, 1, 2, 0:
self.parser.specified_attributes = x
self.assertIs(self.parser.specified_attributes, bool(x))
def test_invalid_attributes(self): def test_invalid_attributes(self):
with self.assertRaises(AttributeError): with self.assertRaises(AttributeError):
self.parser.returns_unicode = 1 self.parser.returns_unicode = 1

10
Tools/clinic/clinic_test.py
View File

@ -3,7 +3,6 @@
# Licensed to the PSF under a contributor agreement. # Licensed to the PSF under a contributor agreement.
# #
import builtins
import clinic import clinic
from clinic import DSLParser from clinic import DSLParser
import collections import collections
@ -747,15 +746,6 @@ Not at column 0!
Nested docstring here, goeth. Nested docstring here, goeth.
""".strip(), function.docstring) """.strip(), function.docstring)
def test_parser_regression_special_character_in_parameter_column_of_docstring_first_line(self):
function = self.parse_function("""
module os
os.stat
path: str
This/used to break Clinic!
""")
self.assertEqual("stat($module, /, path)\n--\n\nThis/used to break Clinic!", function.docstring)
def test_directive(self): def test_directive(self):
c = FakeClinic() c = FakeClinic()
parser = DSLParser(c) parser = DSLParser(c)