Permalink
Browse files

Move pretty into lib, because it's heavily changed now.

  • Loading branch information...
1 parent b390cc3 commit 664ecc2ff43c1293b47266aa0a7c7e5b67ea3c62 @tomspur committed Jan 24, 2011
@@ -27,7 +27,7 @@
# Our own imports
from IPython.config.configurable import Configurable
-from IPython.external import pretty
+from IPython.lib import pretty
from IPython.utils.traitlets import Bool, Dict, Int, Str, CStr
@@ -1,19 +0,0 @@
-## 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
File renamed without changes.
View
@@ -116,7 +116,6 @@ def find_packages():
add_package(packages, 'external.Itpl')
add_package(packages, 'external.mglob')
add_package(packages, 'external.path')
- add_package(packages, 'external.pretty')
add_package(packages, 'external.pyparsing')
add_package(packages, 'external.simplegeneric')
add_package(packages, 'external.validate')

0 comments on commit 664ecc2

Please sign in to comment.