From 96f99c29d11c49833a1b81ef09e013cc1a152c93 Mon Sep 17 00:00:00 2001 From: "Brandon T. Willard" Date: Wed, 5 Sep 2018 17:48:58 -0500 Subject: [PATCH] Fix missing import in `doc` macro expansion --- hy/core/macros.hy | 4 ++-- tests/native_tests/core.hy | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hy/core/macros.hy b/hy/core/macros.hy index 744e237..88b5de9 100644 --- a/hy/core/macros.hy +++ b/hy/core/macros.hy @@ -6,8 +6,6 @@ ;;; These macros form the hy language ;;; They are automatically required in every module, except inside hy.core -(import [importlib [import-module]]) - (import [hy.models [HyList HySymbol]]) (defmacro as-> [head name &rest rest] @@ -248,6 +246,7 @@ Such 'o!' params are available within `body` as the equivalent 'g!' symbol." Use ``#doc foo`` instead for help with tag macro ``#foo``. Use ``(help foo)`` instead for help with runtime objects." `(try + (import [importlib [import-module]]) (help (. (import-module "hy") macros _hy_macros @@ -265,6 +264,7 @@ Such 'o!' params are available within `body` as the equivalent 'g!' symbol." Gets help for a tag macro function available in this module." `(try + (import [importlib [import-module]]) (help (. (import-module "hy") macros _hy_tag diff --git a/tests/native_tests/core.hy b/tests/native_tests/core.hy index 39eb698..496d9bb 100644 --- a/tests/native_tests/core.hy +++ b/tests/native_tests/core.hy @@ -682,3 +682,10 @@ result['y in globals'] = 'y' in globals()") (defn test-comment [] (assert-none (comment

This is merely a comment.

Move along. (Nothing to see here.)

))) + +(defn test-doc [capsys] + (doc doc) + (setv out_err (.readouterr capsys)) + (assert (.startswith (.strip (first out_err)) + "Help on function (doc) in module hy.core.macros:")) + (assert (empty? (second out_err))))