[Checkins] SVN: Products.ZSQLMethods/trunk/ Cleanup and PEP8
Hanno Schlichting
hannosch at hannosch.eu
Fri Jul 9 16:01:07 EDT 2010
Log message for revision 114414:
Cleanup and PEP8
Changed:
U Products.ZSQLMethods/trunk/bootstrap.py
D Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/CHANGES.txt
D Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/README.txt
U Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py
D Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/Setup
U Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/__init__.py
U Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/__init__.py
U Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/test_SQL.py
-=-
Modified: Products.ZSQLMethods/trunk/bootstrap.py
===================================================================
--- Products.ZSQLMethods/trunk/bootstrap.py 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/bootstrap.py 2010-07-09 20:01:06 UTC (rev 114414)
@@ -16,8 +16,6 @@
Simply run this script in a directory containing a buildout.cfg.
The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
-
-$Id: bootstrap.py 108946 2010-02-12 02:40:18Z yusei $
"""
import os, shutil, sys, tempfile, urllib2
Deleted: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/CHANGES.txt
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/CHANGES.txt 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/CHANGES.txt 2010-07-09 20:01:06 UTC (rev 114414)
@@ -1,115 +0,0 @@
-Aqueduct SQL Methods Changes
-
- AqueductSQLMethods 1.2.1
-
- Bugs Fixed
-
- - The new Aqueduct.Results module was ommitted.
-
- AqueductSQLMethods 1.2
-
- Bugs Fixed
-
- - Source changes were lost when resizing the editing screen.
-
- - When testing, on DAs that use new DA protocol,
- non-select SQL is reported as such.
-
- Features Added
-
- - Support for new Aqueduct DA protocol, providing much faster
- retrievals.
-
- - Edit screen size preferences are now distinct from Document
- size preferences.
-
- AqueductSQLMethods 1.1.5
-
- Features Added
-
- - Added permission settings to work with recent Principia versions.
-
-
- Aqueduct SQL Methods 1.1.4
-
- Bugs Fixed
-
- - Generated reports failed in cases where column names contained
- odd characters, as would be the case with::
-
- select salary*1.2 from payrole
-
-
- Aqueduct SQL Methods 1.1.3
-
- Bugs Fixed
-
- - Changed permission settings to be in line with principia 1.2
-
-
- Aqueduct SQL Methods 1.1.2
-
- Bugs Fixed
-
- - If strings contained backslashes but not backslash-t or
- backslash-n, then the backslashes were getting doubled.
-
- Aqueduct SQL Methods 1.1.1
-
- Bugs Fixed
-
- - The SQL string quoting done by the sqlvar and sqltest tags
- failed on non-ANSI-SQL databases like mySQL. Extra hooks
- were added to allow database adapters to provide custom quoting
- logic.
-
- Aqueduct SQL Methods 1.1.0
-
- Features
-
- - New DTML tags are available in SQLMethods that greatly
- improve the ease, safety, and flexibility of database methods.
-
- - SQL Templates are now rendered in the context of the containing
- folder, rather than the method itself.
-
- - Input arguments are shown in input forms in the order that
- they were defined, rather than in alphabetical order.
-
-
- Aqueduct SQL Methods 1.0.5
-
- Features Fixed
-
- - Database methods are slightly better about binding themselves
- to the correct object when acquired.
-
-
- Aqueduct SQL Methods 1.0.4
-
- Features Fixed
-
- - RDBMS transaction boundaries now coincide with Principia
- tranasaction boundaries. For example, if a Document
- runs 3 database methods and the third method raises an error,
- then the other methods are aborted.
-
-
- Aqueduct SQL Methods 1.0.3
-
- Bugs Fixed
-
- - Add permissions were not editable.
-
- - Methods on database records could not use acquired attributes.
-
-
- AqueductSQLMethods 1.0.1
-
- Bug Fixes
-
- - Error reporting was broken in test mode.
-
- Features
-
- - Include generated SQL source in test output.
Deleted: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/README.txt
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/README.txt 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/README.txt 2010-07-09 20:01:06 UTC (rev 114414)
@@ -1,8 +0,0 @@
-ZSQLMethods
-
-
- The ZSQLMethods product provides support for SQL Method objects
- which can be used in conjunction with any database adapter to
- use relational database data from within the Zope environment.
-
-
Modified: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py 2010-07-09 20:01:06 UTC (rev 114414)
@@ -10,18 +10,14 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
-__doc__='''SQL Methods
-
-$Id$'''
-__version__='$Revision: 1.21 $'[11:-2]
-
from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import change_database_methods
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.special_dtml import DTMLFile
from Shared.DC.ZRDB.DA import DA
+
def SQLConnectionIDs(self):
"""Find SQL database connections in the current folder and above
@@ -34,22 +30,29 @@
while self is not None:
if hasattr(self, 'objectValues'):
for o in self.objectValues():
- if (hasattr(o,'_isAnSQLConnection') and o._isAnSQLConnection
- and hasattr(o,'id')):
- id=o.id
- if type(id) is not StringType: id=id()
+ if (hasattr(o, '_isAnSQLConnection') and o._isAnSQLConnection
+ and hasattr(o, 'id')):
+ id = o.id
+ if type(id) is not StringType:
+ id = id()
if not have_id(id):
- if hasattr(o,'title_and_id'): o=o.title_and_id()
- else: o=id
- ids[id]=id
- if hasattr(self, 'aq_parent'): self=self.aq_parent
- else: self=None
+ if hasattr(o, 'title_and_id'):
+ o = o.title_and_id()
+ else:
+ o = id
+ ids[id] = id
+ if hasattr(self, 'aq_parent'):
+ self=self.aq_parent
+ else:
+ self=None
- ids=map(lambda item: (item[1], item[0]), ids.items())
+ ids = map(lambda item: (item[1], item[0]), ids.items())
ids.sort()
return ids
manage_addZSQLMethodForm=DTMLFile('dtml/add', globals())
+
+
def manage_addZSQLMethod(self, id, title,
connection_id, arguments, template,
REQUEST=None, submit=None):
@@ -69,18 +72,21 @@
# Note - type checking is handled by _setObject and constructor.
self._setObject(id, SQL(id, title, connection_id, arguments, template))
if REQUEST is not None:
- try: u=self.DestinationURL()
- except: u=REQUEST['URL1']
+ try:
+ u = self.DestinationURL()
+ except Exception:
+ u = REQUEST['URL1']
if submit==" Add and Edit ":
- u="%s/%s/manage_main" % (u,id)
+ u = "%s/%s/manage_main" % (u, id)
elif submit==" Add and Test ":
- u="%s/%s/manage_testForm" % (u,id)
+ u = "%s/%s/manage_testForm" % (u, id)
else:
- u=u+'/manage_main'
+ u = u+'/manage_main'
REQUEST.RESPONSE.redirect(u)
return ''
+
class SQL(DA):
"""SQL Database methods
Deleted: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/Setup
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/Setup 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/Setup 2010-07-09 20:01:06 UTC (rev 114414)
@@ -1,8 +0,0 @@
-# install SQL.py
-# install __init__.py
-# install add.dtml
-# install edit.dtml
-# install CHANGES.txt
-
-# package Aqueduct
-# package AqueductDA
Modified: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/__init__.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/__init__.py 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/__init__.py 2010-07-09 20:01:06 UTC (rev 114414)
@@ -11,15 +11,18 @@
#
##############################################################################
"""SQL Method Product.
-
-$Id$
"""
-import Shared.DC.ZRDB.Search, Shared.DC.ZRDB.Aqueduct, SQL
+import Shared.DC.ZRDB.Search
+import Shared.DC.ZRDB.Aqueduct
import Shared.DC.ZRDB.RDB
-import Shared.DC.ZRDB.sqlvar, Shared.DC.ZRDB.sqlgroup, Shared.DC.ZRDB.sqltest
+import Shared.DC.ZRDB.sqlvar
+import Shared.DC.ZRDB.sqlgroup
+import Shared.DC.ZRDB.sqltest
+from Products.ZSQLMethods import SQL
+
def initialize(context):
context.registerClass(
@@ -28,31 +31,29 @@
constructors=(SQL.manage_addZSQLMethodForm, SQL.manage_addZSQLMethod),
icon='sqlmethod.gif',
# XXX: can this permission be removed?
- permissions=('Open/Close Database Connections',),
- legacy=(SQL.SQLConnectionIDs,)
- )
+ permissions=('Open/Close Database Connections', ),
+ legacy=(SQL.SQLConnectionIDs, ))
context.registerClass(
meta_type='Z Search Interface',
permission='Add Documents, Images, and Files',
constructors=(Shared.DC.ZRDB.Search.addForm,
Shared.DC.ZRDB.Search.manage_addZSearch),
- legacy=(Shared.DC.ZRDB.Search.ZQueryIds,)
- )
+ legacy=(Shared.DC.ZRDB.Search.ZQueryIds, ))
context.registerHelp()
context.registerHelpTitle('Zope Help')
__module_aliases__=(
- ('Products.AqueductSQLMethods','Products.ZSQLMethods'),
+ ('Products.AqueductSQLMethods', 'Products.ZSQLMethods'),
('Aqueduct', Shared.DC.ZRDB),
('AqueductDA', Shared.DC.ZRDB),
('Products.AqueductSQLMethods.SQL', SQL),
('Aqueduct.Aqueduct', Shared.DC.ZRDB.Aqueduct),
- ('AqueductDA.DA', Shared.DC.ZRDB.DA),
- ('Aqueduct.RDB', Shared.DC.ZRDB.RDB),
- ('AqueductDA.sqlvar', Shared.DC.ZRDB.sqlvar),
- ('AqueductDA.sqltest', Shared.DC.ZRDB.sqltest),
- ('AqueductDA.sqlgroup', Shared.DC.ZRDB.sqlgroup),
+ ('AqueductDA.DA', Shared.DC.ZRDB.DA),
+ ('Aqueduct.RDB', Shared.DC.ZRDB.RDB),
+ ('AqueductDA.sqlvar', Shared.DC.ZRDB.sqlvar),
+ ('AqueductDA.sqltest', Shared.DC.ZRDB.sqltest),
+ ('AqueductDA.sqlgroup', Shared.DC.ZRDB.sqlgroup),
)
Modified: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/__init__.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/__init__.py 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/__init__.py 2010-07-09 20:01:06 UTC (rev 114414)
@@ -1 +1 @@
-# Unit tests for ZSQLMethods
+#
Modified: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/test_SQL.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/test_SQL.py 2010-07-09 19:59:10 UTC (rev 114413)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/tests/test_SQL.py 2010-07-09 20:01:06 UTC (rev 114414)
@@ -1,5 +1,6 @@
import unittest
+
class SQLMethodTests(unittest.TestCase):
def _getTargetClass(self):
@@ -19,6 +20,3 @@
return unittest.TestSuite((
unittest.makeSuite(SQLMethodTests),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
More information about the checkins
mailing list