pp -> pretty

--HG--
branch : trunk

diff --git a/CHANGES b/CHANGES
index e0153c5d1e4261f8e30533a07f63cd8a55237142..77961d515ae1b99a4f3ed88197ec75e0b6956097 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -79,7 +79,7 @@ Version 1.2
 
 - added `getattribute` and `getitem` filter.
 
-- added support for the `pp` library.
+- added support for the `pretty` library.
 
 
 Version 1.1

diff --git a/jinja/filters.py b/jinja/filters.py
index a431e3d77e8bb17f019608f23c1da74d77456199..7cd5e706d2664da6cc90f17411536252a97e9a47 100644 (file)
--- a/jinja/filters.py
+++ b/jinja/filters.py
@@ -428,7 +428,7 @@ def do_pprint(verbose=False):
     Pretty print a variable. Useful for debugging.
 
     With Jinja 1.2 onwards you can pass it a parameter.  If this parameter
-    is truthy the output will be more verbose (this requires `pp`)
+    is truthy the output will be more verbose (this requires `pretty`)
     """
     def wrapped(env, context, value):
         return pformat(value, verbose=verbose)

diff --git a/jinja/utils.py b/jinja/utils.py
index 096afbc684519919f3f101f028d3a6abeab210dd..94619909aabffbbc8628b2d2e45102920359da37 100644 (file)
--- a/jinja/utils.py
+++ b/jinja/utils.py
@@ -352,12 +352,12 @@ del _test_singleton, _test_gen_bug
 
 def pformat(obj, verbose=False):
     """
-    Prettyprint an object.  Either use the `pp` library or the
+    Prettyprint an object.  Either use the `pretty` library or the
     builtin `pprint`.
     """
     try:
-        from pp import pp
-        return pp(obj, verbose=verbose)
+        from pretty import pretty
+        return pretty(obj, verbose=verbose)
     except ImportError:
         from pprint import pformat
         return pformat(obj)