[yt-svn] commit/yt: jzuhone: Merged in ngoldbaum/yt (pull request #2175)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/cfc61bdb1b70/
Changeset:   cfc61bdb1b70
Branch:      yt
User:        jzuhone
Date:        2016-05-18 18:12:17+00:00
Summary:     Merged in ngoldbaum/yt (pull request #2175)

silence deprecation warning from IPython
Affected #:  2 files

diff -r 506d890f8554f9d7c95480410f8add32981b7e7f -r cfc61bdb1b70f6ae65acd4bad85e0aee069bbd62 yt/funcs.py
--- a/yt/funcs.py
+++ b/yt/funcs.py
@@ -318,7 +318,10 @@
         ipshell(header = __header % dd,
                 local_ns = loc, global_ns = glo)
     else:
-        from IPython.config.loader import Config
+        try:
+            from traitlets.config.loader import Config
+        except ImportError:
+            from IPython.config.loader import Config
         cfg = Config()
         cfg.InteractiveShellEmbed.local_ns = loc
         cfg.InteractiveShellEmbed.global_ns = glo

diff -r 506d890f8554f9d7c95480410f8add32981b7e7f -r cfc61bdb1b70f6ae65acd4bad85e0aee069bbd62 yt/utilities/command_line.py
--- a/yt/utilities/command_line.py
+++ b/yt/utilities/command_line.py
@@ -692,7 +692,10 @@
                   "\nHi there!  Welcome to yt.\n\nWe've loaded your dataset as 'ds'.  Enjoy!"
                   )
         else:
-            from IPython.config.loader import Config
+            try:
+                from traitlets.config.loader import Config
+            except ImportError:
+                from IPython.config.loader import Config
             import sys
             cfg = Config()
             # prepend sys.path with current working directory

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-svn-spacepope.org/attachments/20160518/4a72b021/attachment.html>