Fix prettyprint loading as well.

itamarst · Mar 20, 2019 · 92e1e2f · 92e1e2f
1 parent fc8deec
commit 92e1e2f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/eliot/prettyprint.py b/eliot/prettyprint.py
@@ -33,8 +33,13 @@ def _nicer_unicode_repr(o, original_repr=repr):
         else:
             return original_repr(o)
 
-    pprint = load_module(b"unicode_pprint", pprint)
-    pprint.repr = _nicer_unicode_repr
+    try:
+        pprint = load_module(b"unicode_pprint", pprint)
+        pprint.repr = _nicer_unicode_repr
+    except NotImplementedError:
+        # Oh well won't have nicer output.
+        import pprint
+
 
 # Fields that all Eliot messages are expected to have:
 REQUIRED_FIELDS = {TASK_LEVEL_FIELD, TASK_UUID_FIELD, TIMESTAMP_FIELD}

diff --git a/eliot/tests/test_pyinstaller.py b/eliot/tests/test_pyinstaller.py
@@ -25,7 +25,7 @@ def test_importable(self):
         """The Eliot package can be imported inside a PyInstaller packaged binary."""
         output_dir = mkdtemp()
         with NamedTemporaryFile(mode="w") as f:
-            f.write("import eliot\n")
+            f.write("import eliot; import eliot.prettyprint\n")
             f.flush()
             check_call(
                 ["pyinstaller", "--distpath", output_dir,