summaryrefslogtreecommitdiff
path: root/lib/extensions.py
diff options
context:
space:
mode:
authorFederico Di Gregorio <fog@initd.org>2010-04-14 08:57:30 +0200
committerFederico Di Gregorio <fog@initd.org>2010-04-14 08:57:30 +0200
commita90935930bac87d0147d753366b2ff1bd265f9f0 (patch)
tree6509f32b1c74d9eba957e953ac0b1df7ada65dbe /lib/extensions.py
parenteaa97def731faa6fb9b17cfe9005d327f6a70341 (diff)
parent431920b3676ffecc80fd7f0bc25d774d6e5a2aa1 (diff)
downloadpsycopg2-a90935930bac87d0147d753366b2ff1bd265f9f0.tar.gz
Merge remote branch 'piro/fix22' into python2
Diffstat (limited to 'lib/extensions.py')
-rw-r--r--lib/extensions.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/extensions.py b/lib/extensions.py
index edffee9..20f78e6 100644
--- a/lib/extensions.py
+++ b/lib/extensions.py
@@ -33,7 +33,7 @@ This module holds all the extensions to the DBAPI-2.0 provided by psycopg.
# License for more details.
from _psycopg import UNICODE, INTEGER, LONGINTEGER, BOOLEAN, FLOAT
-from _psycopg import TIME, DATE, INTERVAL
+from _psycopg import TIME, DATE, INTERVAL, DECIMAL
from _psycopg import BINARYARRAY, BOOLEANARRAY, DATEARRAY, DATETIMEARRAY
from _psycopg import DECIMALARRAY, FLOATARRAY, INTEGERARRAY, INTERVALARRAY
from _psycopg import LONGINTEGERARRAY, ROWIDARRAY, STRINGARRAY, TIMEARRAY
@@ -41,11 +41,14 @@ from _psycopg import UNICODEARRAY
from _psycopg import Binary, Boolean, Float, QuotedString, AsIs
try:
+ from _psycopg import MXDATE, MXDATETIME, MXINTERVAL, MXTIME
from _psycopg import DateFromMx, TimeFromMx, TimestampFromMx
from _psycopg import IntervalFromMx
except:
pass
+
try:
+ from _psycopg import PYDATE, PYDATETIME, PYINTERVAL, PYTIME
from _psycopg import DateFromPy, TimeFromPy, TimestampFromPy
from _psycopg import IntervalFromPy
except: