summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2019-03-02 08:32:46 -0800
committerJon Dufresne <jon.dufresne@gmail.com>2019-03-02 08:38:03 -0800
commitfc2f3c07c86baf20e8d16c71a5e5ba91e8bd2f61 (patch)
tree3b8fc240f7f2ae9215039916bbc6930c56aa30a5
parenta10327a2833da8eee952d8b832afc33c3c55b282 (diff)
downloadtablib-fc2f3c07c86baf20e8d16c71a5e5ba91e8bd2f61.tar.gz
Merge multiple isinstance() calls to one
-rw-r--r--tablib/core.py6
-rw-r--r--tablib/formats/_json.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/tablib/core.py b/tablib/core.py
index 78c4dce..36f744f 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()