SF.net SVN: matplotlib:[7325] branches/v0_99_maint

[<jd...@us...>]

Revision: 7325
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7325&view=rev
Author:   jdh2358
Date:     2009-07-31 15:52:19 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
added miktex win32 patch from sf patch 2820194

Modified Paths:
--------------
    branches/v0_99_maint/lib/matplotlib/texmanager.py
    branches/v0_99_maint/setupext.py

Modified: branches/v0_99_maint/lib/matplotlib/texmanager.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/texmanager.py	2009-07-31 15:39:30 UTC (rev 7324)
+++ branches/v0_99_maint/lib/matplotlib/texmanager.py	2009-07-31 15:52:19 UTC (rev 7325)
@@ -56,7 +56,7 @@
 
 def dvipng_hack_alpha():
     p = Popen('dvipng -version', shell=True, stdin=PIPE, stdout=PIPE,
-        stderr=STDOUT, close_fds=True)
+        stderr=STDOUT, close_fds=(sys.platform!='win32'))
     stdin, stdout = p.stdin, p.stdout
     for line in stdout:
         if line.startswith('dvipng '):

Modified: branches/v0_99_maint/setupext.py
===================================================================
--- branches/v0_99_maint/setupext.py	2009-07-31 15:39:30 UTC (rev 7324)
+++ branches/v0_99_maint/setupext.py	2009-07-31 15:52:19 UTC (rev 7325)
@@ -174,7 +174,7 @@
                          stdin=subprocess.PIPE,
                          stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT,
-                         close_fds=True)
+                         close_fds=(sys.platform != 'win32'))
     return p.stdin, p.stdout
 
 class CleanUpFile:
@@ -458,7 +458,7 @@
     try:
         stdin, stdout = run_child_process('latex -version')
         line = stdout.readlines()[0]
-        pattern = '3\.1\d+'
+        pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
         match = re.search(pattern, line)
         print_status("latex", match.group(0))
         return True


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.