Merge pull request #639 from jkseppan/issue633

efiring · efiring · commit 2410547d6f2a · 2011-12-27T22:52:49.000-08:00
Work around subprocess EINTR bug; fixes issue #633
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2011-12-27 Work around an EINTR bug in some versions of subprocess. - JKS
+
 2011-08-18 Change api of Axes.get_tightbbox and add an optional
            keyword parameter *call_axes_locator*. - JJL
 
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -835,23 +835,17 @@ def find_tex_file(filename, format=None):
     
     matplotlib.verbose.report('find_tex_file(%s): %s' \
                                   % (filename,cmd), 'debug')
-    pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+    # stderr is unused, but reading it avoids a subprocess optimization
+    # that breaks EINTR handling in some Python versions:
+    # http://bugs.python.org/issue12493
+    # https://github.com/matplotlib/matplotlib/issues/633
+    pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE)
     result = pipe.communicate()[0].rstrip()
     matplotlib.verbose.report('find_tex_file result: %s' % result,
                               'debug')
     return result
 
-def _read_nointr(pipe, bufsize=-1):
-    while True:
-        try:
-            return pipe.read(bufsize)
-        except OSError, e:
-            if e.errno == errno.EINTR:
-                continue
-            else:
-                raise
-        
-
 # With multiple text objects per figure (e.g. tick labels) we may end
 # up reading the same tfm and vf files many times, so we implement a
 # simple cache. TODO: is this worth making persistent?

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2011-12-27 Work around an EINTR bug in some versions of subprocess. - JKS`
	`2`	`+`
`1`	`3`	`2011-08-18 Change api of Axes.get_tightbbox and add an optional`
`2`	`4`	`keyword parameter call_axes_locator. - JJL`
`3`	`5`