Merge branch 'master' of github.com:enthought/codetools into doc/update-changelog

Author: Poruri Sai Rahul

codetools/contexts/tests/multi_context_test_case.py

@@ -5,6 +5,8 @@
 import unittest
 
 import nose
+from nose.plugins.skip import SkipTest
+import six
 
 # Enthought library imports
 from traits.api import Any
@@ -116,6 +118,8 @@ def test_contexts_list_changes(self):
 def test_persistence():
     """ Checking if the data persists correctly when saving and loading back
     """
+    if six.PY2:
+        raise SkipTest("Pickling MultiContext instances is broken on Python 2.")
     d1 = DataContext(name = 'test_context1',
                      subcontext = {'a':1, 'b':2})
     d2 = DataContext(name = 'test_context2',

codetools/contexts/with_mask.py

@@ -121,7 +121,7 @@ def __exit__(self, type, value, tb):
 from codetools.contexts.data_context import DataContext
 from codetools.contexts.multi_context import MultiContext
 from codetools.contexts.adapted_data_context import AdaptedDataContext
-from traits.protocols.api import adapt
+from traits.adaptation.api import adapt
 
 # Local imports
 from .with_mask_adapter import WithMaskAdapter