psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-22 17:06:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Zope cut'n'paste problems.

Browse Source
This commit is contained in:
Federico Di Gregorio 2005-06-17 15:36:28 +00:00
parent d7b10f4a9c
commit 6ad551796c
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2005-06-18 Federico Di Gregorio <fog@initd.org> 2005-06-18 Federico Di Gregorio <fog@initd.org>
* ZPsycopgDA/DA.py: DTMLFile -> HTMLFile everywhere to fix zope cut&paste
problems.
* MANIFEST.in: added missing files to do bdist_rpm.
* lib/psycopg1.py: fixed .dictfetchrow() to return None if fetchone() * lib/psycopg1.py: fixed .dictfetchrow() to return None if fetchone()
returns None instead of raising an exception. returns None instead of raising an exception.

4
MANIFEST.in
View File

@ -5,5 +5,7 @@ recursive-include ZPsycopgDA *.py *.gif *.dtml
recursive-include examples *.py somehackers.jpg whereareyou.jpg recursive-include examples *.py somehackers.jpg whereareyou.jpg
recursive-include debian * recursive-include debian *
recursive-include doc TODO HACKING SUCCESS ChangeLog-1.x recursive-include doc TODO HACKING SUCCESS ChangeLog-1.x
recursive-include scripts *.py *.sh
include scripts/maketypes.sh scripts/buildtypes.py include scripts/maketypes.sh scripts/buildtypes.py
include AUTHORS README INSTALL ChangeLog setup.py setup.cfg include AUTHORS README INSTALL ChangeLog
include PKG-INFO MANIFEST.in MANIFEST setup.py setup.cfg

16
ZPsycopgDA/DA.py
View File

@ -28,7 +28,7 @@ import Acquisition
import Shared.DC.ZRDB.Connection import Shared.DC.ZRDB.Connection
from db import DB from db import DB
from Globals import DTMLFile from Globals import HTMLFile
from ImageFile import ImageFile from ImageFile import ImageFile
from ExtensionClass import Base from ExtensionClass import Base
from App.Dialogs import MessageDialog from App.Dialogs import MessageDialog
@ -46,7 +46,7 @@ from psycopg.extensions import new_type, register_type
# add a new connection to a folder # add a new connection to a folder
manage_addZPsycopgConnectionForm = DTMLFile('dtml/add',globals()) manage_addZPsycopgConnectionForm = HTMLFile('dtml/add',globals())
def manage_addZPsycopgConnection(self, id, title, connection_string, def manage_addZPsycopgConnection(self, id, title, connection_string,
zdatetime=None, tilevel=2, zdatetime=None, tilevel=2,
@ -93,7 +93,7 @@ class Connection(Shared.DC.ZRDB.Connection.Connection):
if check: self.connect(self.connection_string) if check: self.connect(self.connection_string)
manage_properties = DTMLFile('dtml/edit', globals()) manage_properties = HTMLFile('dtml/edit', globals())
def manage_edit(self, title, connection_string, def manage_edit(self, title, connection_string,
zdatetime=None, check=None, tilevel=2, encoding='UTF-8', zdatetime=None, check=None, tilevel=2, encoding='UTF-8',
@ -148,8 +148,8 @@ class Connection(Shared.DC.ZRDB.Connection.Connection):
manage_options = Shared.DC.ZRDB.Connection.Connection.manage_options + ( manage_options = Shared.DC.ZRDB.Connection.Connection.manage_options + (
{'label': 'Browse', 'action':'manage_browse'},) {'label': 'Browse', 'action':'manage_browse'},)
manage_tables = DTMLFile('dtml/tables', globals()) manage_tables = HTMLFile('dtml/tables', globals())
manage_browse = DTMLFile('dtml/browse', globals()) manage_browse = HTMLFile('dtml/browse', globals())
info = None info = None
@ -273,8 +273,8 @@ class values:
class TableBrowser(Browser, Acquisition.Implicit): class TableBrowser(Browser, Acquisition.Implicit):
icon = 'what' icon = 'what'
Description = check = '' Description = check = ''
info = DTMLFile('table_info', globals()) info = HTMLFile('table_info', globals())
menu = DTMLFile('table_menu', globals()) menu = HTMLFile('table_menu', globals())
def tpValues(self): def tpValues(self):
v = values() v = values()
@ -298,7 +298,7 @@ class TableBrowser(Browser, Acquisition.Implicit):
def Name(self): return self._d['TABLE_NAME'] def Name(self): return self._d['TABLE_NAME']
def Type(self): return self._d['TABLE_TYPE'] def Type(self): return self._d['TABLE_TYPE']
manage_designInput=DTMLFile('designInput',globals()) manage_designInput=HTMLFile('designInput',globals())
def manage_buildInput(self, id, source, default, REQUEST=None): def manage_buildInput(self, id, source, default, REQUEST=None):
"Create a database method for an input form" "Create a database method for an input form"
args=[] args=[]