[yt-svn] commit/yt: MatthewTurk: Backporting from a PR the IPython detection

[Bitbucket]

1 new commit in yt:


https://bitbucket.org/yt_analysis/yt/changeset/f227fad041ca/
changeset:   f227fad041ca
branch:      yt
user:        MatthewTurk
date:        2012-11-02 19:17:46
summary:     Backporting from a PR the IPython detection
affected #:  1 file

diff -r a7c6365c00fab74098d33a34cfe3cc8f993f5541 -r f227fad041cad0fe4e0ae8ee3e2661f97ce97d15 yt/funcs.py
--- a/yt/funcs.py
+++ b/yt/funcs.py
@@ -23,6 +23,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import __builtin__
 import time, types, signal, inspect, traceback, sys, pdb, os
 import contextlib
 import warnings, struct, subprocess
@@ -310,7 +311,7 @@
     maxval = max(maxval, 1)
     from yt.config import ytcfg
     if ytcfg.getboolean("yt", "suppressStreamLogging") or \
-       ytcfg.getboolean("yt", "ipython_notebook") or \
+       "__IPYTHON__" in dir(__builtin__) or \
        ytcfg.getboolean("yt", "__withintesting"):
         return DummyProgressBar()
     elif ytcfg.getboolean("yt", "__withinreason"):

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.