13c13,14
< import psycopg
---
> import psycopg2 as psycopg
> from psycopg2.extensions import QuotedString
25a27,29
>     if d.has_key('database'):
>         d['dbname']=d['database']
>         del d['database']
48c52,56
<     template1['database'] = 'template1'
---
>     template1['dbname'] = 'template1'
> 
>     entlist = []
>     for key in template1.keys():
>         entlist += ['%s=%s' % (key, template1[key])]
51c59
<         conn = psycopg.connect(**template1)
---
>         conn = psycopg.connect(' '.join(entlist))
84a93,96
>     entlist = []
>     for key in db.keys():
>         entlist += ['%s=%s' % (key, db[key])]
>     
86c98
<         conn = psycopg.connect(**db)
---
>         conn = psycopg.connect(' '.join(entlist))
100c112,116
<         logging.getLogger('hyperdb').info('open database %r'%db['database'])
---
>         logging.getLogger('hyperdb').info('open database %r'%db['dbname'])
>         entlist = []
>         for key in db.keys():
>             entlist += ['%s=%s' % (key, db[key])]
>     
102c118
<             conn = psycopg.connect(**db)
---
>             conn = psycopg.connect(' '.join(entlist))
182c198
<         ''' psycopg.QuotedString returns a "buffer" object with the
---
>         ''' QuotedString returns a "buffer" object with the
184c200
<         return str(psycopg.QuotedString(str(value)))[1:-1]
---
>         return str(QuotedString(str(value)))[1:-1]