jedi: Add ustruct, json modules.

pybricks · Dec 2, 2022 · fb7a930 · fb7a930
1 parent f7984a4
commit fb7a930
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/jedi/src/pybricks_jedi/__init__.py b/jedi/src/pybricks_jedi/__init__.py
@@ -21,9 +21,11 @@
     "pybricks.tools",
     "uerrno",
     "uio",
+    "ujson",
     "umath",
     "urandom",
     "uselect",
+    "ustruct",
     "usys",
 }
 

diff --git a/jedi/tests/test_complete_import.py b/jedi/tests/test_complete_import.py
@@ -18,9 +18,11 @@ def test_from():
         "pybricks",
         "uerrno",
         "uio",
+        "ujson",
         "umath",
         "urandom",
         "uselect",
+        "ustruct",
         "usys",
     ]
 
@@ -186,6 +188,17 @@ def test_from_uio_import():
     ]
 
 
+def test_from_ujson_import():
+    code = "from ujson import "
+    completions: list[CompletionItem] = json.loads(complete(code, 1, len(code) + 1))
+    assert [c["insertText"] for c in completions] == [
+        "dump",
+        "dumps",
+        "load",
+        "loads",
+    ]
+
+
 def test_from_umath_import():
     code = "from umath import "
     completions: list[CompletionItem] = json.loads(complete(code, 1, len(code) + 1))
@@ -247,6 +260,18 @@ def test_from_uselect_import():
     ]
 
 
+def test_from_ustruct_import():
+    code = "from ustruct import "
+    completions: list[CompletionItem] = json.loads(complete(code, 1, len(code) + 1))
+    assert [c["insertText"] for c in completions] == [
+        "calcsize",
+        "pack",
+        "pack_into",
+        "unpack",
+        "unpack_from",
+    ]
+
+
 def test_from_usys_import():
     code = "from usys import "
     completions: list[CompletionItem] = json.loads(complete(code, 1, len(code) + 1))

diff --git a/pyproject.toml b/pyproject.toml
@@ -18,9 +18,11 @@ packages = [
     { include = "micropython", from = "src" },
     { include = "uerrno", from = "src" },
     { include = "uio", from = "src" },
+    { include = "ujson", from = "src" },
     { include = "umath", from = "src" },
     { include = "urandom", from = "src" },
     { include = "uselect", from = "src" },
+    { include = "ustruct", from = "src" },
     { include = "usys", from = "src" },
 ]
 

diff --git a/src/ujson/__init__.py b/src/ujson/__init__.py
@@ -11,10 +11,6 @@
 
 from typing import IO, Any, Tuple
 
-import json
-
-json.dump
-
 
 def dump(object: Any, stream: IO, separators: Tuple[str, str] = (", ", ": ")):
     """