PY-20125 Don't rely on Python 2 implicit ASCII encoding to format Google/Numpy docstrings

diff --git a/python/helpers/google_formatter.py b/python/helpers/google_formatter.py
index 296e8a2a0f53464e1d39fd82a65f66af0ef16d96..6888b3165b7a16fd1df49c16cce49e6e00f95d40 100644 (file)
--- a/python/helpers/google_formatter.py
+++ b/python/helpers/google_formatter.py
@@ -1,4 +1,3 @@
-import sys
 import textwrap
 
 import rest_formatter
@@ -6,7 +5,7 @@ from sphinxcontrib.napoleon.docstring import GoogleDocstring
 
 
 def main(text=None):
-    src = sys.stdin.read() if text is None else text
+    src = rest_formatter.read_safe() if text is None else text
     rest_formatter.main(str(GoogleDocstring(textwrap.dedent(src))))
 
 

diff --git a/python/helpers/numpy_formatter.py b/python/helpers/numpy_formatter.py
index 9a02e31a33bb534bc9ac29ced7d2f8381389e53d..1de7b8350fd3051267cc59c58d82d03d6e193550 100644 (file)
--- a/python/helpers/numpy_formatter.py
+++ b/python/helpers/numpy_formatter.py
@@ -1,4 +1,3 @@
-import sys
 import textwrap
 
 import rest_formatter
@@ -6,7 +5,7 @@ from sphinxcontrib.napoleon.docstring import NumpyDocstring
 
 
 def main(text=None):
-    src = sys.stdin.read() if text is None else text
+    src = rest_formatter.read_safe() if text is None else text
     rest_formatter.main(str(NumpyDocstring(textwrap.dedent(src))))