Merge pull request #7766 from anntzer/fix-invalid-escapes

efiring · QuLogic · commit 47126aa52470 · 2017-01-29T22:00:47.000-05:00
Invalid escape sequences are deprecated in Py3.6.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -137,7 +137,7 @@
 
 __version__numpy__ = str('1.7.1')  # minimum required numpy version
 
-__bibtex__ = """@Article{Hunter:2007,
+__bibtex__ = r"""@Article{Hunter:2007,
   Author    = {Hunter, J. D.},
   Title     = {Matplotlib: A 2D graphics environment},
   Journal   = {Computing In Science \& Engineering},
@@ -395,7 +395,7 @@ def checkdep_tex():
                              stderr=subprocess.PIPE)
         stdout, stderr = s.communicate()
         line = stdout.decode('ascii').split('\n')[0]
-        pattern = '3\.1\d+'
+        pattern = r'3\.1\d+'
         match = re.search(pattern, line)
         v = match.group(0)
         return v
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6497,7 +6497,7 @@ def hist2d(self, x, y, bins=10, range=None, normed=False, weights=None,
     def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
             window=None, noverlap=None, pad_to=None,
             sides=None, scale_by_freq=None, return_line=None, **kwargs):
-        """
+        r"""
         Plot the power spectral density.
 
         Call signature::
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -889,7 +889,7 @@ def _single_spectrum_helper(x, mode, Fs=None, window=None, pad_to=None,
 @docstring.dedent_interpd
 def psd(x, NFFT=None, Fs=None, detrend=None, window=None,
         noverlap=None, pad_to=None, sides=None, scale_by_freq=None):
-    """
+    r"""
     Compute the power spectral density.
 
     Call signature::
