summaryrefslogtreecommitdiff
path: root/lib/extensions.py
diff options
context:
space:
mode:
authorJames Henstridge <james@jamesh.id.au>2008-05-05 10:22:22 +0800
committerJames Henstridge <james@jamesh.id.au>2008-05-05 10:22:22 +0800
commit31ef9355c21a45d62fdb01293863fe26cd33109a (patch)
tree83e24186396b58e504178c152197cbf0560f7ee4 /lib/extensions.py
parent5689f07de49af1b716b68efd9eaed63bd2f6af8c (diff)
parent96f631d41e302ba5add0987ec4a2be1963a64b37 (diff)
downloadpsycopg2-31ef9355c21a45d62fdb01293863fe26cd33109a.tar.gz
Merge psycopg2/trunk into psycopg2/branches/2_0_x r243 (which is the
last revision merged into trunk). Where file ID conflicts exist, but the content was equivalent, I've picked the 2_0_x version.
Diffstat (limited to 'lib/extensions.py')
-rw-r--r--lib/extensions.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/extensions.py b/lib/extensions.py
index 9233d1d..5fedbd2 100644
--- a/lib/extensions.py
+++ b/lib/extensions.py
@@ -4,6 +4,7 @@ This module holds all the extensions to the DBAPI-2.0 provided by psycopg.
- `connection` -- the new-type inheritable connection class
- `cursor` -- the new-type inheritable cursor class
+- `lobject` -- the new-type inheritable large object class
- `adapt()` -- exposes the PEP-246_ compatible adapting mechanism used
by psycopg to adapt Python types to PostgreSQL ones
@@ -38,7 +39,7 @@ try:
except:
pass
-from _psycopg import adapt, adapters, encodings, connection, cursor
+from _psycopg import adapt, adapters, encodings, connection, cursor, lobject
from _psycopg import string_types, binary_types, new_type, register_type
from _psycopg import ISQLQuote