Merge remote-tracking branch 'upstream/v1.1.x' into merge-v1.1.x

Conflicts:
	CHANGELOG
	lib/matplotlib/dviread.py

Author: jkseppan

CHANGELOG

@@ -1,3 +1,5 @@
+2011-12-27 Work around an EINTR bug in some versions of subprocess. - JKS
+
 2011-10-25 added support for \operatorname to mathtext,
            including the ability to insert spaces, such as
            $\operatorname{arg\,max}$ - PI

lib/matplotlib/dviread.py

@@ -840,23 +840,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.decode('ascii')
 
-def _read_nointr(pipe, bufsize=-1):
-    while True:
-        try:
-            return pipe.read(bufsize)
-        except OSError as 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?

setupext.py

@@ -46,7 +46,7 @@
 import os
 import re
 import subprocess
-from distutils import sysconfig, version
+from distutils import sysconfig
 
 basedir = {
     'win32'  : ['win32_static',],
@@ -558,8 +558,8 @@ def check_for_numpy(min_version):
                       min_version)
         return False
 
-    expected_version = version.StrictVersion(min_version)
-    found_version = version.StrictVersion(numpy.__version__)
+    expected_version = min_version.split('.')
+    found_version = numpy.__version__.split('.')
     if not found_version >= expected_version:
         print_message(
             'numpy %s or later is required; you have %s' %