Skip to content

Commit

Permalink
Merge pull request #2286 from allison-casey/bugfix/require-reader-error
Browse files Browse the repository at this point in the history
Fix: bad var name in reader require exception
  • Loading branch information
allison-casey committed May 23, 2022
2 parents 22021c5 + 6fcf2ea commit c0efd94
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 1 addition & 3 deletions hy/macros.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,7 @@ def require_reader(source_module, target_module, assignments):
if name in source_module.__reader_macros__:
target_macros[name] = source_macros[name]
else:
raise HyRequireError(
"Could not require name {} from {}".format(_name, source_module)
)
raise HyRequireError(f"Could not require name {name} from {source_module}")

return True

Expand Down
4 changes: 3 additions & 1 deletion tests/native_tests/reader_macros.hy
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,6 @@
(with [(pytest.raises hy.errors.HySyntaxError)]
(eval-module #[[(require tests.resources.tlib [taggart] [upper])]]))
(with [(pytest.raises hy.errors.HySyntaxError)]
(eval-module #[[(require tests.resources.tlib :readers [taggart] :readers [upper])]])))
(eval-module #[[(require tests.resources.tlib :readers [taggart] :readers [upper])]]))
(with [(pytest.raises hy.errors.HyRequireError)]
(eval-module #[[(require tests.resources.tlib :readers [not-a-real-reader])]])))

0 comments on commit c0efd94

Please sign in to comment.