Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

tacaswell · tacaswell · commit f8f8244205fc · 2016-01-17T21:21:42.000-05:00
Conflicts:
	lib/matplotlib/lines.py
	   keep the _dashoffset = 0 line
	setupext.py
	   use the version from 1.5.x
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -4051,7 +4051,7 @@ def __init__(self, posA=None, posB=None,
     def set_dpi_cor(self, dpi_cor):
         """
         dpi_cor is currently used for linewidth-related things and
-        shink factor. Mutation scale is not affected by this.
+        shrink factor. Mutation scale is not affected by this.
         """
 
         self._dpi_cor = dpi_cor
@@ -4060,14 +4060,14 @@ def set_dpi_cor(self, dpi_cor):
     def get_dpi_cor(self):
         """
         dpi_cor is currently used for linewidth-related things and
-        shink factor. Mutation scale is not affected by this.
+        shrink factor. Mutation scale is not affected by this.
         """
 
         return self._dpi_cor
 
     def set_positions(self, posA, posB):
-        """ set the begin end end positions of the connecting
-        path. Use current vlaue if None.
+        """ set the begin and end positions of the connecting
+        path. Use current value if None.
         """
         if posA is not None:
             self._posA_posB[0] = posA
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -359,12 +359,20 @@ def _image_directories(func):
             # namespace package pip installed and run via the nose
             # multiprocess plugin or as a specific test this may be
             # missing. See https://github.com/matplotlib/matplotlib/issues/3314
-        assert mods.pop(0) == 'tests'
+        if mods.pop(0) != 'tests':
+            warnings.warn(("Module '%s' does not live in a parent module "
+                "named 'tests'. This is probably ok, but we may not be able "
+                "to guess the correct subdirectory containing the baseline "
+                "images. If things go wrong please make sure that there is "
+                "a parent directory named 'tests' and that it contains a "
+                "__init__.py file (can be empty).") % module_name)
         subdir = os.path.join(*mods)
 
         import imp
         def find_dotted_module(module_name, path=None):
-            """A version of imp which can handle dots in the module name"""
+            """A version of imp which can handle dots in the module name.
+               As for imp.find_module(), the return value is a 3-element
+               tuple (file, pathname, description)."""
             res = None
             for sub_mod in module_name.split('.'):
                 try:
diff --git a/setupext.py b/setupext.py
@@ -17,7 +17,8 @@
 import versioneer
 
 
-PY3 = (sys.version_info[0] >= 3)
+PY3min = (sys.version_info[0] >= 3)
+PY32min = (PY3min and sys.version_info[1] >= 2 or sys.version_info[0] > 3)
 
 
 # This is the version of FreeType to use when building a local
@@ -28,13 +29,13 @@
 LOCAL_FREETYPE_HASH = '348e667d728c597360e4a87c16556597'
 
 if sys.platform != 'win32':
-    if sys.version_info[0] < 3:
+    if not PY3min:
         from commands import getstatusoutput
     else:
         from subprocess import getstatusoutput
 
 
-if PY3:
+if PY3min:
     import configparser
 else:
     import ConfigParser as configparser
@@ -51,7 +52,10 @@
 
 setup_cfg = os.environ.get('MPLSETUPCFG', 'setup.cfg')
 if os.path.exists(setup_cfg):
-    config = configparser.SafeConfigParser()
+    if PY32min:
+        config = configparser.ConfigParser()
+    else:
+        config = configparser.SafeConfigParser()
     config.read(setup_cfg)
 
     if config.has_option('status', 'suppress'):
@@ -483,12 +487,17 @@ class OptionalPackage(SetupPackage):
     def get_config(cls):
         """
         Look at `setup.cfg` and return one of ["auto", True, False] indicating
-        if the package is at default state ("auto"), forced by the user (True)
-        or opted-out (False).
+        if the package is at default state ("auto"), forced by the user (case
+        insensitively defined as 1, true, yes, on for True) or opted-out (case
+        insensitively defined as 0, false, no, off for False).
         """
+        conf = "auto"
         if config is not None and config.has_option(cls.config_category, cls.name):
-            return config.get(cls.config_category, cls.name)
-        return "auto"
+            try:
+                conf = config.getboolean(cls.config_category, cls.name)
+            except ValueError:
+                conf = config.get(cls.config_category, cls.name)
+        return conf
 
     def check(self):
         """
@@ -1376,7 +1385,7 @@ def __init__(self):
 
     def check_requirements(self):
         try:
-            if PY3:
+            if PY3min:
                 import tkinter as Tkinter
             else:
                 import Tkinter
@@ -1427,7 +1436,7 @@ def query_tcltk(self):
             return self.tcl_tk_cache
 
         # By this point, we already know that Tkinter imports correctly
-        if PY3:
+        if PY3min:
             import tkinter as Tkinter
         else:
             import Tkinter
@@ -1468,7 +1477,7 @@ def query_tcltk(self):
 
     def parse_tcl_config(self, tcl_lib_dir, tk_lib_dir):
         try:
-            if PY3:
+            if PY3min:
                 import tkinter as Tkinter
             else:
                 import Tkinter
