Moved matplotlib.subprocess_fixed to matplotlib.compat.subprocess.

Author: mgiuca-google

lib/matplotlib/__init__.py

@@ -132,7 +132,7 @@
 # definitions, so it is safe to import from it here.
 from matplotlib.cbook import MatplotlibDeprecationWarning
 from matplotlib.cbook import is_string_like
-import matplotlib.subprocess_fixed as subprocess
+from matplotlib.compat import subprocess
 
 try:
     reload

lib/matplotlib/animation.py

@@ -21,7 +21,7 @@
 import itertools
 import contextlib
 from matplotlib.cbook import iterable, is_string_like
-import matplotlib.subprocess_fixed as subprocess
+from matplotlib.compat import subprocess
 from matplotlib import verbose
 from matplotlib import rcParams
 

lib/matplotlib/backends/backend_pgf.py

@@ -20,8 +20,8 @@
 from matplotlib import font_manager
 from matplotlib.ft2font import FT2Font
 from matplotlib.cbook import is_string_like, is_writable_file_like
-import matplotlib.subprocess_fixed as subprocess
-from matplotlib.subprocess_fixed import check_output
+from matplotlib.compat import subprocess
+from matplotlib.compat.subprocess import check_output
 
 
 ###############################################################################

lib/matplotlib/backends/backend_ps.py

@@ -88,7 +88,7 @@ def gs_version(self):
         except KeyError:
             pass
 
-        from matplotlib.subprocess_fixed import Popen, PIPE
+        from matplotlib.compat.subprocess import Popen, PIPE
         pipe = Popen(self.gs_exe + " --version",
                      shell=True, stdout=PIPE).stdout
         if sys.version_info[0] >= 3:

lib/matplotlib/cbook.py

@@ -1211,7 +1211,7 @@ def restrict_dict(d, keys):
 
 def report_memory(i=0):  # argument may go away
     'return the memory consumed by process'
-    from matplotlib.subprocess_fixed import Popen, PIPE
+    from matplotlib.compat.subprocess import Popen, PIPE
     pid = os.getpid()
     if sys.platform == 'sunos5':
         try:

lib/matplotlib/compat/__init__.py

@@ -8,7 +8,7 @@
 
 Instead of importing subprocess, other modules should use this as follows:
 
-import subprocess_fixed as subprocess
+from matplotlib.compat import subprocess
 
 This module is safe to import from anywhere within matplotlib.
 """

lib/matplotlib/subprocess_fixed.py lib/matplotlib/compat/subprocess.pylib/matplotlib/subprocess_fixed.py renamed to lib/matplotlib/compat/subprocess.py

@@ -23,7 +23,7 @@
 import errno
 import matplotlib
 import matplotlib.cbook as mpl_cbook
-import matplotlib.subprocess_fixed as subprocess
+from matplotlib.compat import subprocess
 import numpy as np
 import struct
 import sys

lib/matplotlib/dviread.py

@@ -54,9 +54,9 @@
 from matplotlib import rcParams, get_configdir
 from matplotlib.cbook import is_string_like
 import matplotlib.cbook as cbook
+from matplotlib.compat import subprocess
 from matplotlib.fontconfig_pattern import \
     parse_fontconfig_pattern, generate_fontconfig_pattern
-import matplotlib.subprocess_fixed as subprocess
 
 try:
     import cPickle as pickle

lib/matplotlib/font_manager.py

@@ -7,7 +7,7 @@
 from __future__ import division
 
 import matplotlib
-import matplotlib.subprocess_fixed as subprocess
+from matplotlib.compat import subprocess
 from matplotlib.testing.noseclasses import ImageComparisonFailure
 from matplotlib.testing import image_util, util
 from matplotlib import _png