summaryrefslogtreecommitdiff
path: root/tablib/formats
diff options
context:
space:
mode:
authorTimo Furrer <tuxtimo@gmail.com>2019-03-03 16:43:10 +0100
committerGitHub <noreply@github.com>2019-03-03 16:43:10 +0100
commit3abd7e8c53e96f22cdbd3e7f95dd41fdb5e7c1d0 (patch)
tree56089e848fd7cec363f80306c50fca59a601a748 /tablib/formats
parent0be9e6a74be877808716151a3280ad3c489c54c1 (diff)
parentfc2f3c07c86baf20e8d16c71a5e5ba91e8bd2f61 (diff)
downloadtablib-3abd7e8c53e96f22cdbd3e7f95dd41fdb5e7c1d0.tar.gz
Merge pull request #351 from jdufresne/isinstance
Merge multiple isinstance() calls to one
Diffstat (limited to 'tablib/formats')
-rw-r--r--tablib/formats/_json.py2
1 files changed, 1 insertions, 1 deletions
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()