Merge branch 'master' into fix-smartquotes

Author: chrisjsewell

markdown_it/cli/parse.py

@@ -40,13 +40,11 @@ def convert_file(filename):
         sys.exit('Cannot open file "{}".'.format(filename))
 
 
-def interactive(import_readline=False):
+def interactive():
     """
     Parse user input, dump to stdout, rinse and repeat.
     Python REPL style.
     """
-    if import_readline:
-        _import_readline()
     print_heading()
     contents = []
     more = False
@@ -98,13 +96,6 @@ def parse_args(args):
     return parser.parse_args(args)
 
 
-def _import_readline():
-    try:
-        import readline  # noqa: F401
-    except ImportError:
-        print("[warning] readline library not available.")
-
-
 def print_heading():
     print("{} (interactive)".format(version_str))
     print("Type Ctrl-D to complete input, or Ctrl-C to exit.")

markdown_it/main.py

@@ -240,7 +240,8 @@ def render(self, src: str, env: Optional[AttrDict] = None) -> Any:
         But you will not need it with high probability. See also comment
         in [[MarkdownIt.parse]].
         """
-        env = env or AttrDict()
+        if env is None:
+            env = AttrDict()
         return self.renderer.render(self.parse(src, env), self.options, env)
 
     def parseInline(self, src: str, env: Optional[AttrDict] = None) -> List[Token]:

tests/test_api/test_main.py

@@ -1,6 +1,7 @@
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
 from markdown_it.rules_core import StateCore
+from markdown_it.utils import AttrDict
 
 
 def test_get_rules():
@@ -250,3 +251,16 @@ def test_noneState():
 
     # Check that we can process None str with empty env and block_tokens
     md.core.process(state)
+
+
+def test_empty_env():
+    """Test that an empty `env` is mutated, not copied and mutated."""
+    md = MarkdownIt()
+
+    env = AttrDict()
+    md.render("[foo]: /url\n[foo]", env)
+    assert "references" in env
+
+    env = AttrDict()
+    md.parse("[foo]: /url\n[foo]", env)
+    assert "references" in env

tests/test_cli.py

@@ -24,5 +24,5 @@ def mock_input(prompt):
 
     with patch("builtins.print") as patched:
         with patch("builtins.input", mock_input):
-            parse.interactive(import_readline=False)
+            parse.interactive()
     patched.assert_called()