FIX: resolve conflict

jklymak · jklymak · commit cc567ecc41b5 · 2018-08-04T09:48:02.000-07:00
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -272,7 +272,7 @@ def do_constrained_layout(fig, renderer, h_pad, w_pad,
                 # This routine makes all the subplot spec containers
                 # have the correct arrangement.  It just stacks the
                 # subplot layoutboxes in the correct order...
-                arange_subplotspecs(child, hspace=hspace, wspace=wspace)
+                _arange_subplotspecs(child, hspace=hspace, wspace=wspace)
 
         # - Align right/left and bottom/top spines of appropriate subplots.
         # - Compare size of subplotspec including height and width ratios
@@ -443,7 +443,7 @@ def do_constrained_layout(fig, renderer, h_pad, w_pad,
             ax._set_position(newpos, which='original')
 
 
-def arange_subplotspecs(gs, hspace=0, wspace=0):
+def _arange_subplotspecs(gs, hspace=0, wspace=0):
     """
     arange the subplotspec children of this gridspec, and then recursively
     do the same of any gridspec children of those gridspecs...
@@ -453,9 +453,8 @@ def arange_subplotspecs(gs, hspace=0, wspace=0):
         if child._is_subplotspec_layoutbox():
             for child2 in child.children:
                 # check for gridspec children...
-                name = (child2.name).split('.')[-1][:-3]
-                if name == 'gridspec':
-                    arange_subplotspecs(child2, hspace=hspace, wspace=wspace)
+                if child2._is_gridspec_layoutbox():
+                    _arrange_subplotspecs(child2, hspace=hspace, wspace=wspace)
             sschildren += [child]
     # now arrange the subplots...
     for child0 in sschildren:
diff --git a/lib/matplotlib/_layoutbox.py b/lib/matplotlib/_layoutbox.py
@@ -358,20 +358,16 @@ def _is_subplotspec_layoutbox(self):
         Helper to check if this layoutbox is the layoutbox of a
         subplotspec
         '''
-        name = (self.name).split('.')[-1][:-3]
-        if name == 'ss':
-            return True
-        return False
+        name = (self.name).split('.')[-1]
+        return name[:2] == 'ss'
 
     def _is_gridspec_layoutbox(self):
         '''
         Helper to check if this layoutbox is the layoutbox of a
         gridspec
         '''
-        name = (self.name).split('.')[-1][:-3]
-        if name == 'gridspec':
-            return True
-        return False
+        name = (self.name).split('.')[-1]
+        return name[:8] == 'gridspec'
 
     def find_child_subplots(self):
         '''
@@ -650,7 +646,7 @@ def seq_id():
 
     global _layoutboxobjnum
 
-    return ('%03d' % (next(_layoutboxobjnum)))
+    return ('%06d' % (next(_layoutboxobjnum)))
 
 
 def print_children(lb):
