Skip to content
Browse files

Don't use the system pretty...

... because upstream pretty does not (yet?) incorporate the changes to
the local _pretty.

Signed-off-by: Thomas Spura <tomspur@fedoraproject.org>
  • Loading branch information...
1 parent 21647ae commit 67f9fe72e69d8234200d939b209cd9a67ae48957 @tomspur committed Nov 5, 2010
Showing with 19 additions and 4 deletions.
  1. +19 −4 IPython/external/pretty/__init__.py
View
23 IPython/external/pretty/__init__.py
@@ -1,4 +1,19 @@
-try:
- from pretty import *
-except ImportError:
- from _pretty import *
+## Current upstream pretty, does not (yet?) incorporate the changes to the
+## local _pretty.py
+#try:
+# from pretty import *
+# import pretty
+# _singleton_pprinters = pretty._singleton_pprinters
+# _type_pprinters = pretty._type_pprinters
+# _deferred_type_pprinters = pretty._deferred_type_pprinters
+#except ImportError:
+# from _pretty import *
+# import _pretty
+# _singleton_pprinters = _pretty._singleton_pprinters
+# _type_pprinters = _pretty._type_pprinters
+# _deferred_type_pprinters = _pretty._deferred_type_pprinters
+from _pretty import *
+import _pretty
+_singleton_pprinters = _pretty._singleton_pprinters
+_type_pprinters = _pretty._type_pprinters
+_deferred_type_pprinters = _pretty._deferred_type_pprinters

0 comments on commit 67f9fe7

Please sign in to comment.
Something went wrong with that request. Please try again.