summaryrefslogtreecommitdiff
path: root/lib/_json.py
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2012-09-20 00:36:53 +0100
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2012-09-20 00:39:34 +0100
commit9b2ad7abb5a67921cc2cc9e18e37eb6f9aeee4b4 (patch)
tree45666403c857166b38eda0d2c2d95407e234fa28 /lib/_json.py
parent7386b8327cf4b77666a67e150ce660bf4ff489b6 (diff)
downloadpsycopg2-9b2ad7abb5a67921cc2cc9e18e37eb6f9aeee4b4.tar.gz
Fixed json typecaster with NULL input
Diffstat (limited to 'lib/_json.py')
-rw-r--r--lib/_json.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/_json.py b/lib/_json.py
index c21d6c8..9142c57 100644
--- a/lib/_json.py
+++ b/lib/_json.py
@@ -197,6 +197,8 @@ def _create_json_typecasters(oid, array_oid, loads=None):
loads = json.loads
def typecast_json(s, cur):
+ if s is None:
+ return None
return loads(s)
JSON = new_type((oid, ), 'JSON', typecast_json)