summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-12-15 09:52:23 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2017-12-15 09:52:23 -0500
commit19e13cf3d203b59ad285ab0193cb9fc53c4fcff2 (patch)
tree60c513868de83f4bbe33a7c1659fe0870832329a
parentf1aab6402f5602fe796c3281a601c436745616d7 (diff)
parente80a5adfd406e2392cfaad687e8b3f0ae9ed4e11 (diff)
downloadsqlalchemy-19e13cf3d203b59ad285ab0193cb9fc53c4fcff2.tar.gz
Merge remote-tracking branch 'origin/pr/403'
-rw-r--r--doc/build/core/custom_types.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/build/core/custom_types.rst b/doc/build/core/custom_types.rst
index 5384d0fd4..6864e1915 100644
--- a/doc/build/core/custom_types.rst
+++ b/doc/build/core/custom_types.rst
@@ -163,7 +163,9 @@ binary in CHAR(16) if desired::
if value is None:
return value
else:
- return uuid.UUID(value)
+ if not isinstance(value, uuid.UUID):
+ value = uuid.UUID(value)
+ return value
Marshal JSON Strings
^^^^^^^^^^^^^^^^^^^^