check types with isinstance; allow tuple, where possible

Author: dizcza

py/visdom/__init__.py

@@ -140,7 +140,7 @@ def _title2str(opts):
 
 
 def _scrub_dict(d):
-    if type(d) is dict:
+    if isinstance(d, dict):
         return {k: _scrub_dict(v) for k, v in list(d.items())
                 if v is not None and _scrub_dict(v) is not None}
     else:
@@ -1561,9 +1561,10 @@ def scatter(self, X, Y=None, win=None, env=None, opts=None, update=None,
         _assert_opts(opts)
 
         if opts.get('legend'):
-            assert type(opts['legend']) == list and K <= len(opts['legend']), \
-                'largest label should not be greater than size of the ' \
-                'legends table'
+            assert isinstance(opts['legend'], (tuple, list)) \
+                   and K <= len(opts['legend']), \
+                   'largest label should not be greater than size of ' \
+                   'the legends table'
 
         data = []
         trace_opts = opts.get('traceopts', {'plotly': {}})['plotly']

py/visdom/server.py

@@ -407,7 +407,7 @@ def get_messages(self):
         to_send = []
         while len(self.messages) > 0:
             message = self.messages.pop()
-            if type(message) is dict:
+            if isinstance(message, dict):
                 # Not all messages are being formatted the same way (JSON)
                 # TODO investigate
                 message = json.dumps(message)
@@ -656,7 +656,7 @@ def get_messages(self):
         to_send = []
         while len(self.messages) > 0:
             message = self.messages.pop()
-            if type(message) is dict:
+            if isinstance(message, dict):
                 # Not all messages are being formatted the same way (JSON)
                 # TODO investigate
                 message = json.dumps(message)
@@ -769,7 +769,7 @@ def window(args):
 
 def broadcast(self, msg, eid):
     for s in self.subs:
-        if type(self.subs[s].eid) is list:
+        if isinstance(self.subs[s].eid, dict):
             if eid in self.subs[s].eid:
                 self.subs[s].write_message(msg)
         else: