From c2fa0a153a6bb83881c7abca6d57af43df605d3d Mon Sep 17 00:00:00 2001
From: Ivan Levkivskyi <levkivskyi@gmail.com>
Date: Fri, 19 Jan 2018 22:42:31 +0000
Subject: [PATCH] Minor improvements to simplejson stubs (#1832)

This fixes signatures of `load` and `loads` and cleans-up
`JSONDecodeError`.
---
 third_party/2/simplejson/__init__.pyi |  6 +++---
 third_party/2/simplejson/scanner.pyi  | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/third_party/2/simplejson/__init__.pyi b/third_party/2/simplejson/__init__.pyi
index 4565543b1..452a4ffc7 100644
--- a/third_party/2/simplejson/__init__.pyi
+++ b/third_party/2/simplejson/__init__.pyi
@@ -1,4 +1,4 @@
-from typing import Any, IO
+from typing import Any, IO, Text
 
 from simplejson.scanner import JSONDecodeError as JSONDecodeError
 from simplejson.decoder import JSONDecoder as JSONDecoder
@@ -6,5 +6,5 @@ from simplejson.encoder import JSONEncoder as JSONEncoder, JSONEncoderForHTML as
 
 def dumps(obj: Any, *args: Any, **kwds: Any) -> str: ...
 def dump(obj: Any, fp: IO[str], *args: Any, **kwds: Any) -> None: ...
-def loads(s: str, **kwds: Any) -> Any: ...
-def load(fp: IO[str]) -> Any: ...
+def loads(s: Text, **kwds: Any) -> Any: ...
+def load(fp: IO[str], **kwds: Any) -> Any: ...
diff --git a/third_party/2/simplejson/scanner.pyi b/third_party/2/simplejson/scanner.pyi
index 760b24dc0..5de484a07 100644
--- a/third_party/2/simplejson/scanner.pyi
+++ b/third_party/2/simplejson/scanner.pyi
@@ -1,7 +1,11 @@
-from typing import Any, IO
+from typing import Optional
 
 class JSONDecodeError(ValueError):
-    def dumps(self, obj: Any) -> str: ...
-    def dump(self, obj: Any, fp: IO[str], *args: Any, **kwds: Any) -> None: ...
-    def loads(self, s: str) -> Any: ...
-    def load(self, fp: IO[str]) -> Any: ...
+    msg: str = ...
+    doc: str = ...
+    pos: int = ...
+    end: Optional[int] = ...
+    lineno: int = ...
+    colno: int = ...
+    endlineno: Optional[int] = ...
+    endcolno: Optional[int] = ...