Cleanup unused code & small fixes

Author: neumond

computercraft/errors.py

@@ -1,7 +1,3 @@
-class CommandException(Exception):
-    pass
-
-
 class LuaException(Exception):
     pass
 

computercraft/rproc.py

@@ -3,13 +3,15 @@
 
 def coro(result):
     assert isinstance(result, list)
-    if len(result) < 2:
-        result.append(None)
-    assert len(result) == 2
-    success, result = result
+    assert len(result) >= 1
+    success, *result = result
     assert isinstance(success, bool)
     if not success:
         raise LuaException(result)
+    if result == []:
+        return None
+    if len(result) == 1:
+        return result[0]
     return result
 
 
@@ -52,10 +54,13 @@ def any_list(result):
     return result
 
 
-def fact_tuple(*components):
+def fact_tuple(*components, tail_nils=0):
     def proc(result):
         result = any_list(result)
-        assert len(components) == result
+        assert len(components) + tail_nils >= len(result) >= len(components)
+        while len(result) < len(components):
+            result.append(None)
+        assert len(components) == len(result)
         return tuple(comp(value) for comp, value in zip(components, result))
     return proc
 

computercraft/subapis/base.py

@@ -1,4 +1,4 @@
-from ..errors import CommandException, ApiException
+from ..errors import ApiException
 from typing import Union
 
 
@@ -63,64 +63,6 @@ def lua_args(*params, omit_nulls=True):
     return ', '.join(ps)
 
 
-def bool_success(v):
-    if v == [True]:
-        return
-    if len(v) == 2 and v[0] is False:
-        assert isinstance(v[1], str)
-        raise CommandException(v[1])
-    raise ApiException('Bad return value: {}'.format(v))
-
-
-def single_return(v):
-    assert len(v) == 1
-    return v[0]
-
-
-def make_optional(fn):
-    def op_fn(v):
-        if v == []:
-            return None
-        return fn(v)
-    return op_fn
-
-
-def make_single_value_return(validator, converter=None):
-    def fn(v):
-        assert len(v) == 1
-        if converter is not None:
-            v[0] = converter(v[0])
-        assert validator(v[0])
-        return v[0]
-    return fn
-
-
-bool_return = make_single_value_return(lambda v: isinstance(v, bool))
-int_return = make_single_value_return(lambda v: isinstance(v, int) and not isinstance(v, bool))
-number_return = make_single_value_return(lambda v: isinstance(v, (int, float)) and not isinstance(v, bool))
-str_return = make_single_value_return(lambda v: isinstance(v, str))
-str_bool_return = make_single_value_return(lambda v: isinstance(v, (str, bool)))
-list_return = make_single_value_return(
-    lambda v: isinstance(v, list),
-    lambda v: [] if v == {} else v,
-)
-dict_return = make_single_value_return(lambda v: isinstance(v, dict))
-
-
-@make_optional
-def nil_return(v):
-    assert False
-
-
-opt_bool_return = make_optional(bool_return)
-opt_int_return = make_optional(int_return)
-opt_number_return = make_optional(number_return)
-opt_str_return = make_optional(str_return)
-opt_str_bool_return = make_optional(str_bool_return)
-opt_list_return = make_optional(list_return)
-opt_dict_return = make_optional(dict_return)
-
-
 class BaseSubAPI:
     _API = NotImplemented
 

computercraft/subapis/commands.py

@@ -1,32 +1,17 @@
 from typing import Tuple, List, Optional
 
 from .base import BaseSubAPI
-from ..errors import CommandException
-from ..rproc import tuple3_integer, any_dict, any_list, array_string, integer
+from ..rproc import tuple3_integer, any_dict, any_list, array_string, integer, fact_tuple, boolean, option_integer
 
 
-class CommandsAPI(BaseSubAPI):
-    _API = 'commands'
-
-    async def exec(self, command: str) -> Tuple[str, Optional[int]]:
-        # TODO: use rproc
-        r = await self._send('exec', command)
-        assert len(r) == 3
-        assert isinstance(r[0], bool)
+command_result = fact_tuple(boolean, array_string, option_integer, tail_nils=1)
 
-        if r[1] == {}:
-            r[1] = []
-        assert isinstance(r[1], list)
-        r[1] = '\n'.join(r[1])
 
-        if r[2] is None:
-            r[2] = 0
-        assert isinstance(r[2], int)
-
-        if r[0] is False:
-            raise CommandException(r[1])
+class CommandsAPI(BaseSubAPI):
+    _API = 'commands'
 
-        return r[1], r[2]
+    async def exec(self, command: str) -> Tuple[bool, List[str], Optional[int]]:
+        return command_result(await self._send('exec', command))
 
     async def execAsync(self, command: str) -> int:
         return integer(await self._send('execAsync', command))

computercraft/subapis/peripheral.py

@@ -1,6 +1,6 @@
 from typing import Optional, List, Tuple, Any
 
-from .base import BaseSubAPI, bool_success
+from .base import BaseSubAPI
 from .mixins import TermMixin
 from ..rproc import boolean, nil, integer, string, option_integer, option_string, tuple2_integer, array_string
 

testmod.py

@@ -3,7 +3,7 @@
 from time import monotonic
 from types import FunctionType
 
-from computercraft.errors import LuaException, CommandException
+from computercraft.errors import LuaException
 
 
 async def hello(api):
@@ -257,14 +257,16 @@ async def test_commands_api(api):
     for c in cmdlist:
         assert isinstance(c, str)
 
-    assert await api.commands.exec('say Hello!') == ('', AnyInstanceOf(int))
+    assert await api.commands.exec('say Hello!') == (True, [], AnyInstanceOf(int))
 
-    with assert_raises(CommandException):
-        await api.commands.exec('tp hajejndlasksdkelefsns fjeklaskslekffjslas')
+    d = await api.commands.exec('tp hajejndlasksdkelefsns fjeklaskslekffjslas')
+    assert d[0] is False
 
     d = await api.commands.exec('difficulty')
-    assert d[0].startswith('The difficulty is ')
-    assert isinstance(d[1], int)
+    assert d[0] is True
+    assert len(d[1]) == 1
+    assert d[1][0].startswith('The difficulty is ')
+    assert isinstance(d[2], int)
 
     await api.print('Test finished successfully')