[yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/9f67757a44ef/
changeset:   9f67757a44ef
branch:      yt
user:        xarthisius
date:        2012-09-20 11:24:55
summary:     Import ParseFatalException from a proper module
affected #:  1 file

diff -r 2120043a7851f77c41c67f5301640528cc8b5314 -r 9f67757a44ef2b2cfae8d68f60419803dc6cee77 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -27,7 +27,7 @@
 import base64
 import matplotlib.figure
 from matplotlib.mathtext import MathTextParser
-from matplotlib.pyparsing import ParseFatalException
+from pyparsing import ParseFatalException
 import cStringIO
 import types
 import __builtin__



https://bitbucket.org/yt_analysis/yt/changeset/b30f700ac72b/
changeset:   b30f700ac72b
branch:      yt
user:        xarthisius
date:        2012-09-20 17:01:42
summary:     Use try, except statement for importing pyparsing in case it's not present in matplotlib
affected #:  1 file

diff -r 9f67757a44ef2b2cfae8d68f60419803dc6cee77 -r b30f700ac72bcaa6d1e6145499d5e8a13c747e06 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -27,7 +27,10 @@
 import base64
 import matplotlib.figure
 from matplotlib.mathtext import MathTextParser
-from pyparsing import ParseFatalException
+try:
+    from matplotlib.pyparsing import ParseFatalException
+except ImportError:
+    from pyparsing import ParseFatalException
 import cStringIO
 import types
 import __builtin__

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.