[med-svn] [python-mne] 311/353: FIX : fix doc with nested import of pylab in psd.py

[Yaroslav Halchenko]

This is an automated email from the git hooks/post-receive script.

yoh pushed a commit to tag 0.4
in repository python-mne.

commit 3ab7ace16badf0a1f6e88c2c8756c7ac8b112463
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Wed Jul 25 10:57:44 2012 +0200

    FIX : fix doc with nested import of pylab in psd.py
---
 mne/time_frequency/psd.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mne/time_frequency/psd.py b/mne/time_frequency/psd.py
index 32c5d47..5443759 100644
--- a/mne/time_frequency/psd.py
+++ b/mne/time_frequency/psd.py
@@ -2,10 +2,13 @@
 # License : BSD 3-clause
 
 import numpy as np
-import pylab as pl
+
+# XXX : don't import pylab here or you will break the doc
+
 from ..parallel import parallel_func
 from ..fiff.proj import make_projector_info
 
+
 def compute_raw_psd(raw, tmin=0, tmax=np.inf, picks=None,
                     fmin=0, fmax=np.inf, NFFT=2048, n_jobs=1,
                     plot=False, proj=False):
@@ -71,6 +74,7 @@ def compute_raw_psd(raw, tmin=0, tmax=np.inf, picks=None,
 
     print "Effective window size : %0.3f (s)" % (NFFT / float(Fs))
 
+    import pylab as pl
     parallel, my_psd, n_jobs = parallel_func(pl.psd, n_jobs, verbose=0)
     fig = pl.figure()
     out = parallel(my_psd(d, Fs=Fs, NFFT=NFFT) for d in data)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git