From 8f1875b97b2b10460dbed1ce5dc3ad39915cf137 Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Mon, 24 Apr 2017 15:03:07 -0700
Subject: [PATCH] fixes to xml.sax (#1201)

---
 stdlib/2and3/xml/sax/__init__.pyi | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/stdlib/2and3/xml/sax/__init__.pyi b/stdlib/2and3/xml/sax/__init__.pyi
index 71534b00f..93a0f9a88 100644
--- a/stdlib/2and3/xml/sax/__init__.pyi
+++ b/stdlib/2and3/xml/sax/__init__.pyi
@@ -1,19 +1,20 @@
-from typing import List
+from typing import Any, List, Optional, Text, Union
+from mypy_extensions import NoReturn
 
 import xml.sax
-from xml.sax.xmlreader import InputSource
+from xml.sax.xmlreader import InputSource, Locator
 from xml.sax.handler import ContentHandler, ErrorHandler
 
 class SAXException(Exception):
-    def __init__(self, msg, exception=None): ...
-    def getMessage(self): ...
-    def getException(self): ...
-    def __getitem__(self, ix): ...
+    def __init__(self, msg: str, exception: Optional[Exception] = ...) -> None: ...
+    def getMessage(self) -> str: ...
+    def getException(self) -> Exception: ...
+    def __getitem__(self, ix: Any) -> NoReturn: ...
 
 class SAXParseException(SAXException):
-    def __init__(self, msg, exception, locator): ...
-    def getColumnNumber(self): ...
-    def getLineNumber(self): ...
+    def __init__(self, msg: str, exception: Exception, locator: Locator) -> None: ...
+    def getColumnNumber(self) -> int: ...
+    def getLineNumber(self) -> int: ...
     def getPublicId(self): ...
     def getSystemId(self): ...
 
@@ -23,12 +24,12 @@ class SAXReaderNotAvailable(SAXNotSupportedException): ...
 
 default_parser_list = ...  # type: List[str]
 
-def make_parser(parser_list: List[str]) -> xml.sax.xmlreader.XMLReader: ...
+def make_parser(parser_list: List[str] = ...) -> xml.sax.xmlreader.XMLReader: ...
 
 def parse(source: str, handler: xml.sax.handler.ContentHandler,
-          errorHandler: xml.sax.handler.ErrorHandler=...): ...
+          errorHandler: xml.sax.handler.ErrorHandler = ...) -> None: ...
 
-def parseString(string: str, handler: xml.sax.handler.ContentHandler,
-                errorHandler: xml.sax.handler.ErrorHandler=...): ...
+def parseString(string: Union[bytes, Text], handler: xml.sax.handler.ContentHandler,
+                errorHandler: Optional[xml.sax.handler.ErrorHandler] = ...) -> None: ...
 
 def _create_parser(parser_name: str) -> xml.sax.xmlreader.XMLReader: ...