Merge pull request #351 from jdufresne/isinstance

Merge multiple isinstance() calls to one

2 files changed, 4 insertions, 4 deletions

diff --git a/tablib/core.py b/tablib/core.py
index 0889845..2af0244 100644
--- a/tablib/core.py
+++ b/tablib/core.py
@@ -179,7 +179,7 @@ class Dataset(object):
 
 
     def __getitem__(self, key):
-        if isinstance(key, str) or isinstance(key, unicode):
+        if isinstance(key, (str, unicode)):
             if key in self.headers:
                 pos = self.headers.index(key) # get 'key' index from each data
                 return [row[pos] for row in self._data]
@@ -198,7 +198,7 @@ class Dataset(object):
 
 
     def __delitem__(self, key):
-        if isinstance(key, str) or isinstance(key, unicode):
+        if isinstance(key, (str, unicode)):
 
             if key in self.headers:
 
@@ -895,7 +895,7 @@ class Dataset(object):
         sorted.
         """
 
-        if isinstance(col, str) or isinstance(col, unicode):
+        if isinstance(col, (str, unicode)):
 
             if not self.headers:
                 raise HeadersNeeded
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py
index bbd2c96..a794a3d 100644
--- a/tablib/formats/_json.py
+++ b/tablib/formats/_json.py
@@ -14,7 +14,7 @@ extensions = ('json', 'jsn')
 
 
 def serialize_objects_handler(obj):
-    if isinstance(obj, decimal.Decimal) or isinstance(obj, UUID):
+    if isinstance(obj, (decimal.Decimal, UUID)):
         return str(obj)
     elif hasattr(obj, 'isoformat'):
         return obj.isoformat()