DEP: Add a condition to use self.assertRaisesRegexp for python 2.7

Author: samatix

tests/pipeline/test_pipeline.py

@@ -4,6 +4,7 @@
 from unittest import TestCase
 
 from mock import patch
+from six import PY2
 
 from zipline.pipeline import Factor, Filter, Pipeline
 from zipline.pipeline.data import Column, DataSet, USEquityPricing
@@ -43,6 +44,10 @@ class SomeOtherFilter(Filter):
 
 class PipelineTestCase(TestCase):
 
+    if PY2:
+        def assertRaisesRegex(self, *args, **kwargs):
+            return self.assertRaisesRegexp(*args, **kwargs)
+
     def test_construction(self):
         p0 = Pipeline()
         self.assertEqual(p0.columns, {})

zipline/testing/fixtures.py

@@ -7,7 +7,7 @@
 from logbook import NullHandler, Logger
 import numpy as np
 import pandas as pd
-from six import with_metaclass, iteritems, itervalues
+from six import with_metaclass, iteritems, itervalues, PY2
 import responses
 from toolz import flip, groupby, merge
 from trading_calendars import (
@@ -251,6 +251,10 @@ def add_instance_callback(self, callback):
         """
         return self._instance_teardown_stack.callback(callback)
 
+    if PY2:
+        def assertRaisesRegex(self, *args, **kwargs):
+            return self.assertRaisesRegexp(*args, **kwargs)
+
 
 def alias(attr_name):
     """Make a fixture attribute an alias of another fixture's attribute by