[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[serhiy.storchaka]

https://hg.python.org/cpython/rev/323f226136f4
changeset:   101129:323f226136f4
parent:      101127:9348e88c89c8
parent:      101128:dd223c585fb6
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Apr 24 23:53:16 2016 +0300
summary:
  Merge 3.5

files:
  Lib/test/test_pyexpat.py    |   6 ------
  Tools/clinic/clinic_test.py |  10 ----------
  2 files changed, 0 insertions(+), 16 deletions(-)


diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -42,12 +42,6 @@
             self.parser.specified_attributes = 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):
         with self.assertRaises(AttributeError):
             self.parser.returns_unicode = 1
diff --git a/Tools/clinic/clinic_test.py b/Tools/clinic/clinic_test.py
--- a/Tools/clinic/clinic_test.py
+++ b/Tools/clinic/clinic_test.py
@@ -3,7 +3,6 @@
 # Licensed to the PSF under a contributor agreement.
 #
 
-import builtins
 import clinic
 from clinic import DSLParser
 import collections
@@ -747,15 +746,6 @@
     Nested docstring here, goeth.
 """.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):
         c = FakeClinic()
         parser = DSLParser(c)

-- 
Repository URL: https://hg.python.org/cpython