Merge pull request #8 from eriknw/repr_must_be_str

repr methods must return str.  Also, pass client to remotely.

afar/core.py

@@ -27,8 +27,9 @@ class AfarException(Exception):
 
 
 class Where:
-    def __init__(self, where, submit_kwargs=None):
+    def __init__(self, where, client=None, submit_kwargs=None):
         self.where = where
+        self.client = client
         self.submit_kwargs = submit_kwargs
 
     def __enter__(self):
@@ -37,8 +38,8 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_value, exc_traceback):  # pragma: no cover
         return False
 
-    def __call__(self, **submit_kwargs):
-        return Where(self.where, submit_kwargs)
+    def __call__(self, *, client=None, **submit_kwargs):
+        return Where(self.where, client, submit_kwargs)
 
 
 remotely = Where("remotely")
@@ -166,9 +167,11 @@ def _exit(self, exc_type, exc_value, exc_traceback):
             where = exc_value.args[0]
             self._where = where.where
             submit_kwargs = where.submit_kwargs or {}
+            client = where.client
         elif issubclass(exc_type, NameError) and exc_value.args[0] in _errors_to_locations:
             self._where = _errors_to_locations[exc_value.args[0]]
             submit_kwargs = {}
+            client = None
         else:
             # The exception is valid
             return False
@@ -189,7 +192,8 @@ def _exit(self, exc_type, exc_value, exc_traceback):
         display_expr = self._magic_func._display_expr
 
         if self._where == "remotely":
-            client = distributed.client._get_global_client()
+            if client is None:
+                client = distributed.client._get_global_client()
             remote_dict = client.submit(run_afar, self._magic_func, names, futures, **submit_kwargs)
             if display_expr:
                 repr_val = client.submit(

afar/reprs.py

@@ -93,9 +93,7 @@ def get_repr_methods():
         return
     attr_recorder = AttrRecorder()
     ip.display_formatter.format(attr_recorder)
-    repr_methods = attr_recorder._attrs
-    repr_methods.append("__repr__")
-    return repr_methods
+    return attr_recorder._attrs
 
 
 def repr_afar(val, repr_methods):
@@ -118,8 +116,10 @@ def repr_afar(val, repr_methods):
             rv = traceback.format_exception(*exc_info)
             return rv, method_name, True
         else:
+            if rv is None or not isinstance(rv, str):
+                continue
             return rv, method_name, False
-    return None, "__repr__", False
+    return repr(val), "__repr__", False
 
 
 def display_repr(results):