fix various 'isinstance(..., str)' to 'isinstance(..., basestring)'

These are mostly checking for valid msg_ids, which should accept both.

in parallel.client

IPython/parallel/client/client.py

@@ -440,7 +440,7 b' class Client(HasTraits):'
         
         if targets is None:
             targets = self._ids
-        elif isinstance(targets, str):
+        elif isinstance(targets, basestring):
             if targets.lower() == 'all':
                 targets = self._ids
             else:
@@ -825,7 +825,7 b' class Client(HasTraits):'
         if jobs is None:
             theids = self.outstanding
         else:
-            if isinstance(jobs, (int, str, AsyncResult)):
+            if isinstance(jobs, (int, basestring, AsyncResult)):
                 jobs = [jobs]
             theids = set()
             for job in jobs:
@@ -1096,7 +1096,7 b' class Client(HasTraits):'
         for id in indices_or_msg_ids:
             if isinstance(id, int):
                 id = self.history[id]
-            if not isinstance(id, str):
+            if not isinstance(id, basestring):
                 raise TypeError("indices must be str or int, not %r"%id)
             theids.append(id)
         
@@ -1146,7 +1146,7 b' class Client(HasTraits):'
         for id in indices_or_msg_ids:
             if isinstance(id, int):
                 id = self.history[id]
-            if not isinstance(id, str):
+            if not isinstance(id, basestring):
                 raise TypeError("indices must be str or int, not %r"%id)
             theids.append(id)
 

IPython/parallel/client/view.py

@@ -809,11 +809,11 b' class LoadBalancedView(View):'
         
         For use in `set_flags`.
         """
-        if dep is None or isinstance(dep, (str, AsyncResult, Dependency)):
+        if dep is None or isinstance(dep, (basestring, AsyncResult, Dependency)):
             return True
         elif isinstance(dep, (list,set, tuple)):
             for d in dep:
-                if not isinstance(d, (str, AsyncResult)):
+                if not isinstance(d, (basestring, AsyncResult)):
                     return False
         elif isinstance(dep, dict):
             if set(dep.keys()) != set(Dependency().as_dict().keys()):
@@ -821,7 +821,7 b' class LoadBalancedView(View):'
             if not isinstance(dep['msg_ids'], list):
                 return False
             for d in dep['msg_ids']:
-                if not isinstance(d, str):
+                if not isinstance(d, basestring):
                     return False
         else:
             return False