PR: Remove ujson dependency for Windows (it requires the install of MSVC compiler) (#26)

* Remove ujson dependency for Windows (requires the install of MSVC compiler)

* Update setup.py and stream write test

* Add broad exception for ujson import

Author: dalthviz

examples/langserver.py

@@ -1,10 +1,14 @@
-import ujson as json
 import logging
 
 from tornado import web, ioloop, websocket
 
 from pyls_jsonrpc import dispatchers, endpoint
 
+try:
+    import ujson as json
+except Exception:  # pylint: disable=broad-except
+    import json
+
 log = logging.getLogger(__name__)
 
 

examples/langserver_ext.py

@@ -1,4 +1,3 @@
-import ujson as json
 import logging
 import subprocess
 import threading
@@ -7,6 +6,11 @@
 
 from pyls_jsonrpc import streams
 
+try:
+    import ujson as json
+except Exception:  # pylint: disable=broad-except
+    import json
+
 log = logging.getLogger(__name__)
 
 

pyls_jsonrpc/streams.py

@@ -2,7 +2,10 @@
 import logging
 import threading
 
-import ujson as json
+try:
+    import ujson as json
+except Exception:  # pylint: disable=broad-except
+    import json
 
 log = logging.getLogger(__name__)
 

setup.py

@@ -34,7 +34,7 @@
     install_requires=[
         'future>=0.14.0',
         'futures; python_version<"3.2"',
-        'ujson<=1.35',
+        'ujson<=1.35; platform_system!="Windows"',
     ],
 
     # List additional groups of dependencies here (e.g. development

test/test_streams.py

@@ -1,6 +1,7 @@
 # Copyright 2018 Palantir Technologies, Inc.
 # pylint: disable=redefined-outer-name
 from io import BytesIO
+import os
 import mock
 import pytest
 
@@ -77,12 +78,21 @@ def test_writer(wfile, writer):
         'method': 'method',
         'params': {}
     })
-    assert wfile.getvalue() == (
-        b'Content-Length: 44\r\n'
-        b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
-        b'\r\n'
-        b'{"id":"hello","method":"method","params":{}}'
-    )
+
+    if os.name == 'nt':
+        assert wfile.getvalue() == (
+            b'Content-Length: 49\r\n'
+            b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
+            b'\r\n'
+            b'{"id": "hello", "method": "method", "params": {}}'
+        )
+    else:
+        assert wfile.getvalue() == (
+            b'Content-Length: 44\r\n'
+            b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
+            b'\r\n'
+            b'{"id":"hello","method":"method","params":{}}'
+        )
 
 
 def test_writer_bad_message(wfile, writer):
@@ -97,9 +107,13 @@ def test_writer_bad_message(wfile, writer):
         minute=1,
         second=1,
     ))
-    assert wfile.getvalue() == (
-        b'Content-Length: 10\r\n'
-        b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
-        b'\r\n'
-        b'1546304461'
-    )
+
+    if os.name == 'nt':
+        assert wfile.getvalue() == b''
+    else:
+        assert wfile.getvalue() == (
+            b'Content-Length: 10\r\n'
+            b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
+            b'\r\n'
+            b'1546304461'
+        )