Python 2.6 fix for '{}' -> '{0}'

theengineear · theengineear · commit 78cb2408c6c2 · 2014-07-17T16:20:46.000-07:00
diff --git a/plotly/matplotlylib/renderer.py b/plotly/matplotlylib/renderer.py
@@ -138,11 +138,11 @@ def open_axes(self, ax, props):
         self.axis_ct += 1
         # set defaults in axes
         xaxis = XAxis(
-            anchor='y{}'.format(self.axis_ct),
+            anchor='y{0}'.format(self.axis_ct),
             zeroline=False,
             ticks='inside')
         yaxis = YAxis(
-            anchor='x{}'.format(self.axis_ct),
+            anchor='x{0}'.format(self.axis_ct),
             zeroline=False,
             ticks='inside')
         # update defaults with things set in mpl
@@ -163,8 +163,8 @@ def open_axes(self, ax, props):
 
 
         # put axes in our figure
-        self.plotly_fig['layout']['xaxis{}'.format(self.axis_ct)] = xaxis
-        self.plotly_fig['layout']['yaxis{}'.format(self.axis_ct)] = yaxis
+        self.plotly_fig['layout']['xaxis{0}'.format(self.axis_ct)] = xaxis
+        self.plotly_fig['layout']['yaxis{0}'.format(self.axis_ct)] = yaxis
 
     def close_axes(self, ax):
         """Close the axes object and clean up.
@@ -214,8 +214,8 @@ def draw_bar(self, patch_coll):
         bar = Bar(orientation=orientation,
                   x=x,
                   y=y,
-                  xaxis='x{}'.format(self.axis_ct),
-                  yaxis='y{}'.format(self.axis_ct),
+                  xaxis='x{0}'.format(self.axis_ct),
+                  yaxis='y{0}'.format(self.axis_ct),
                   opacity=patch_coll[0]['alpha'],
                   marker=Marker(
                       color=patch_coll[0]['facecolor'],
@@ -297,8 +297,8 @@ def draw_marked_line(self, **props):
                                   name=props['label'],
                                   x=[xy_pair[0] for xy_pair in props['data']],
                                   y=[xy_pair[1] for xy_pair in props['data']],
-                                  xaxis='x{}'.format(self.axis_ct),
-                                  yaxis='y{}'.format(self.axis_ct),
+                                  xaxis='x{0}'.format(self.axis_ct),
+                                  yaxis='y{0}'.format(self.axis_ct),
                                   line=line,
                                   marker=marker)
             self.plotly_fig['data'] += marked_line,
@@ -528,12 +528,12 @@ def draw_text(self, **props):
                             "coordinates\n"
                 x, y = props['position']
                 axis_ct = self.axis_ct
-                xaxis = self.plotly_fig['layout']['xaxis{}'.format(axis_ct)]
-                yaxis = self.plotly_fig['layout']['yaxis{}'.format(axis_ct)]
+                xaxis = self.plotly_fig['layout']['xaxis{0}'.format(axis_ct)]
+                yaxis = self.plotly_fig['layout']['yaxis{0}'.format(axis_ct)]
                 if (xaxis['range'][0] < x < xaxis['range'][1]
                         and yaxis['range'][0] < y < yaxis['range'][1]):
-                    xref = 'x{}'.format(self.axis_ct)
-                    yref = 'y{}'.format(self.axis_ct)
+                    xref = 'x{0}'.format(self.axis_ct)
+                    yref = 'y{0}'.format(self.axis_ct)
                 else:
                     self.msg += "            Text object is outside " \
                                 "plotting area, making 'paper' reference.\n"
@@ -645,7 +645,7 @@ def draw_xlabel(self, **props):
 
         """
         self.msg += "        Adding xlabel\n"
-        axis_key = 'xaxis{}'.format(self.axis_ct)
+        axis_key = 'xaxis{0}'.format(self.axis_ct)
         self.plotly_fig['layout'][axis_key]['title'] = props['text']
         titlefont = Font(size=props['style']['fontsize'],
                          color=props['style']['color'])
@@ -675,7 +675,7 @@ def draw_ylabel(self, **props):
 
         """
         self.msg += "        Adding ylabel\n"
-        axis_key = 'yaxis{}'.format(self.axis_ct)
+        axis_key = 'yaxis{0}'.format(self.axis_ct)
         self.plotly_fig['layout'][axis_key]['title'] = props['text']
         titlefont = Font(size=props['style']['fontsize'],
                          color=props['style']['color'])
