Merge pull request #7153 from cpcloud/test-compat-2.6-7152

BUG/COMPAT: test compat on Python 2.6

Author: cpcloud

pandas/tests/test_graphics.py

@@ -1364,10 +1364,8 @@ def test_boxplot(self):
 
  # Multiple columns with an ax argument is not supported
  fig, ax = self.plt.subplots()
- self.assertRaisesRegexp(
- ValueError, 'existing axis', df.boxplot,
- column=['Col1', 'Col2'], by='X', ax=ax
- )
+ with tm.assertRaisesRegexp(ValueError, 'existing axis'):
+ df.boxplot(column=['Col1', 'Col2'], by='X', ax=ax)
 
  # When by is None, check that all relevant lines are present in the dict
  fig, ax = self.plt.subplots()

pandas/tseries/plotting.py

@@ -75,15 +75,17 @@ def tsplot(series, plotf, **kwargs):
  args.append(style)
 
  lines = plotf(ax, *args, **kwargs)
- label = kwargs.get('label', None)
 
  # set date formatter, locators and rescale limits
  format_dateaxis(ax, ax.freq)
  left, right = _get_xlim(ax.get_lines())
  ax.set_xlim(left, right)
 
  # x and y coord info
- ax.format_coord = lambda t, y: "t = {} y = {:8f}".format(Period(ordinal=int(t), freq=ax.freq), y)
+ ax.format_coord = lambda t, y: ("t = {0} "
+ "y = {1:8f}".format(Period(ordinal=int(t),
+ freq=ax.freq),
+ y))
 
  return lines