Remove PyFunctional dependency (#589)

* Remove PyFunctional dependency

* Docstring

Author: chrisrink10

CHANGELOG.md

@@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  * Fixed a bug where `def` forms did not permit recursive references to the `def`'ed Vars (#578)
  * Fixed a bug where `concat` could cause a `RecursionEror` if used on a `LazySeq` instance which itself calls `concat` (#588)
 
+### Removed
+ * Removed `pyfunctional` dependency in favor of Python standard library functions (#589)
+
 ## [v0.1.dev14] - 2020-06-18
 ### Added
  * Added support for `future`s (#441)

Pipfile

@@ -6,27 +6,26 @@ name = "pypi"
 [dev-packages]
 black = "*"
 docutils = "==0.15"
+isort = "*"
 pygments = "*"
 pytest-pycharm = "*"
 sphinx = "*"
 sphinx-rtd-theme = "*"
 tox = "*"
 tox-pyenv = "*"
 twine = "*"
-isort = "*"
 
 [packages]
 astor = "*"
 atomos = "*"
 attrs = "*"
 basilisp = {editable = true,path = "."}
 click = "*"
+immutables = "*"
 prompt-toolkit = "~=3.0.0"
-pyfunctional = "*"
 pyrsistent = "*"
 python-dateutil = "*"
 pytest = "*"
-immutables = "*"
 
 [requires]
 python_version = "3.6"

Pipfile.lock

@@ -8,9 +8,6 @@ ignore_missing_imports = True
 [mypy-astor.*]
 ignore_missing_imports = True
 
-[mypy-functional.*]
-ignore_missing_imports = True
-
 [mypy-prompt_toolkit.*]
 ignore_missing_imports = True
 

mypy.ini

@@ -27,7 +27,6 @@
     "click",
     "immutables",
     "prompt-toolkit>=3.0.0",
-    "pyfunctional",
     "pyrsistent",
     "pytest",
     "python-dateutil",

setup.py

@@ -3134,15 +3134,16 @@ def _str_to_py_ast(_: GeneratorContext, form: str) -> ast.AST:
 def _const_sym_to_py_ast(ctx: GeneratorContext, form: sym.Symbol) -> GeneratedPyAST:
     meta = _const_meta_kwargs_ast(ctx, form)
 
-    sym_kwargs = (
+    sym_kwarg = (
         Maybe(form.ns)
-        .stream()
-        .map(lambda v: ast.keyword(arg="ns", value=ast.Constant(v)))
-        .to_list()
+        .map(lambda v: [ast.keyword(arg="ns", value=ast.Constant(v))])
+        .or_else(list)
     )
-    sym_kwargs.extend(Maybe(meta).map(lambda p: [p.node]).or_else_get([]))
+    meta_kwarg = Maybe(meta).map(lambda p: [p.node]).or_else(list)
     base_sym = ast.Call(
-        func=_NEW_SYM_FN_NAME, args=[ast.Constant(form.name)], keywords=sym_kwargs
+        func=_NEW_SYM_FN_NAME,
+        args=[ast.Constant(form.name)],
+        keywords=list(chain(sym_kwarg, meta_kwarg)),
     )
 
     return GeneratedPyAST(
@@ -3155,9 +3156,8 @@ def _const_sym_to_py_ast(ctx: GeneratorContext, form: sym.Symbol) -> GeneratedPy
 def _kw_to_py_ast(_: GeneratorContext, form: kw.Keyword) -> ast.AST:
     kwarg = (
         Maybe(form.ns)
-        .stream()
-        .map(lambda ns: ast.keyword(arg="ns", value=ast.Constant(form.ns)))
-        .to_list()
+        .map(lambda ns: [ast.keyword(arg="ns", value=ast.Constant(form.ns))])
+        .or_else(list)
     )
     return ast.Call(
         func=_NEW_KW_FN_NAME, args=[ast.Constant(form.name)], keywords=kwarg

src/basilisp/lang/compiler/generator.py

@@ -8,7 +8,7 @@
 from functools import singledispatch
 from typing import Any, Callable, Iterable, Pattern, Tuple, Union
 
-from functional import seq
+from basilisp.util import take
 
 PrintCountSetting = Union[bool, int, None]
 
@@ -92,7 +92,7 @@ def entry_reprs():
     print_dup = kwargs["print_dup"]
     print_length = kwargs["print_length"]
     if not print_dup and isinstance(print_length, int):
-        items = seq(entry_reprs()).take(print_length + 1).to_list()
+        items = list(take(entry_reprs(), print_length + 1))
         if len(items) > print_length:
             items.pop()
             trailer.append(SURPASSED_PRINT_LENGTH)
@@ -124,12 +124,12 @@ def seq_lrepr(
     print_dup = kwargs["print_dup"]
     print_length = kwargs["print_length"]
     if not print_dup and isinstance(print_length, int):
-        items = seq(iterable).take(print_length + 1).to_list()
+        items = list(take(iterable, print_length + 1))
         if len(items) > print_length:
             items.pop()
             trailer.append(SURPASSED_PRINT_LENGTH)
     else:
-        items = iterable
+        items = iterable  # type: ignore
 
     items = list(map(lambda o: lrepr(o, **kwargs), items))
     seq_lrepr = PRINT_SEPARATOR.join(items + trailer)

src/basilisp/lang/obj.py

@@ -29,7 +29,6 @@
 )
 
 import attr
-from functional import seq
 
 import basilisp.lang.keyword as keyword
 import basilisp.lang.list as llist
@@ -1111,8 +1110,8 @@ def _process_syntax_quoted_form(
     elif isinstance(form, lset.Set):
         return llist.l(_APPLY, _HASH_SET, lconcat(_expand_syntax_quote(ctx, form)))
     elif isinstance(form, lmap.Map):
-        flat_kvs = seq(form.items()).flatten().to_list()
-        return llist.l(_APPLY, _HASH_MAP, lconcat(_expand_syntax_quote(ctx, flat_kvs)))
+        flat_kvs = list(chain.from_iterable(form.items()))
+        return llist.l(_APPLY, _HASH_MAP, lconcat(_expand_syntax_quote(ctx, flat_kvs)))  # type: ignore
     elif isinstance(form, symbol.Symbol):
         if form.ns is None and form.name.endswith("#"):
             try: