mirror of
https://github.com/psycopg/psycopg2.git
synced 2025-08-05 21:00:08 +03:00
Merge 139143ae62
into 90ee1ebba5
This commit is contained in:
commit
ae9d26644d
17
lib/_json.py
17
lib/_json.py
|
@ -34,13 +34,16 @@ from psycopg2._psycopg import new_type, new_array_type, register_type
|
||||||
|
|
||||||
|
|
||||||
# import the best json implementation available
|
# import the best json implementation available
|
||||||
if sys.version_info[:2] >= (2,6):
|
try:
|
||||||
import json
|
import ujson as json
|
||||||
else:
|
except ImportError:
|
||||||
try:
|
if sys.version_info[:2] >= (2,6):
|
||||||
import simplejson as json
|
import json
|
||||||
except ImportError:
|
else:
|
||||||
json = None
|
try:
|
||||||
|
import simplejson as json
|
||||||
|
except ImportError:
|
||||||
|
json = None
|
||||||
|
|
||||||
|
|
||||||
# oids from PostgreSQL 9.2
|
# oids from PostgreSQL 9.2
|
||||||
|
|
Loading…
Reference in New Issue
Block a user