Merge branch 'master' into protocol-example-plots-dimdata

.travis.yml

@@ -10,6 +10,7 @@ before_install:
     - pip install numpy
     - pip install pyzmq --install-option="--zmq=bundled"
     - pip install ipython
+      #- pip install matplotlib  # takes too long to build
     - pip install mpi4py --allow-all-external --allow-unverified mpi4py
     - pip install cython
     - CC=mpicc pip install git+https://github.com/h5py/h5py.git --install-option="--mpi"

distarray/context.py

@@ -421,6 +421,7 @@ def save_hdf5(self, filename, da, key='buffer', mode='a'):
             The identifier for the group to save the DistArray to (the default
             is 'buffer').
         mode : optional, {'w', 'w-', 'a'}, default 'a'
+
             ``'w'``
                 Create file, truncate if exists
             ``'w-'``

distarray/decorators.py

@@ -66,11 +66,11 @@ def key_and_push_args(self, args, kwargs, context=None, da_handler=None):
         This allows us to use the following interface to execute code on
         the engines:
 
-        def foo(*args, **kwargs):
-            args, kwargs = _key_and_push_args(args, kwargs)
-            exec_str = "remote_foo(*%s, **%s)"
-            exec_str %= (args, kwargs)
-            context.execute(exec_str)
+        >>> def foo(*args, **kwargs):
+        >>>     args, kwargs = _key_and_push_args(args, kwargs)
+        >>>     exec_str = "remote_foo(*%s, **%s)"
+        >>>     exec_str %= (args, kwargs)
+        >>>     context.execute(exec_str)
         """
 
         if context is None: