[Checkins] SVN: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/ Some cleanup, but the code is hopeless :)

Hanno Schlichting hannosch at hannosch.eu
Fri Jul 9 16:11:42 EDT 2010


Log message for revision 114417:
  Some cleanup, but the code is hopeless :)
  

Changed:
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/RDB.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Search.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/dbi_db.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlgroup.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqltest.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlvar.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testResult.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testTM.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_results.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlgroup.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlvar.py

-=-
Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -10,11 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Shared classes and functions
 
-$Id$'''
-__version__='$Revision: 1.58 $'[11:-2]
-
 import binascii
 from cStringIO import StringIO
 import os

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -10,11 +10,8 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Generic Database Connection Support
+'''Generic Database Connection Support'''
 
-$Id$'''
-__version__='$Revision: 1.39 $'[11:-2]
-
 from cgi import escape
 from cStringIO import StringIO
 from logging import getLogger

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -10,8 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Generic Database adapter'''
-__version__='$Revision: 1.116 $'[11:-2]
+'''Generic Database adapter'''
 
 from cStringIO import StringIO
 import re

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/RDB.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/RDB.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/RDB.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -10,13 +10,9 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Class for reading RDB files
+'''Class for reading RDB files'''
 
-
-$Id$'''
-__version__='$Revision: 1.33 $'[11:-2]
-
-from string import split, strip, lower, upper, atof, atoi, atol, find, join,find
+from string import split, strip, lower, upper, atof, atoi, atol, find, join
 import DateTime,re
 from Missing import MV
 from array import array

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Search.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Search.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Search.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -10,11 +10,8 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Search Interface Wizard
+'''Search Interface Wizard'''
 
-$Id$'''
-__version__='$Revision: 1.22 $'[11:-2]
-
 from string import join
 from cgi import escape
 

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/dbi_db.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/dbi_db.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/dbi_db.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -10,19 +10,8 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''short description
 
-
-$Id$'''
-#     Copyright
-#
-#       Copyright 1997 Digital Creations, Inc, 910 Princess Anne
-#       Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
-#       rights reserved.
-#
-__version__='$Revision: 1.11 $'[11:-2]
-
-import string, sys
+import sys
 from string import strip, split, find, join
 
 import transaction

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlgroup.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlgroup.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlgroup.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -59,25 +59,10 @@
     other than whitespace characters.  If it does, then it is inserted
     with the appropriate boolean operator, as indicated by use of an
     'and' or 'or' tag, otherwise, no text is inserted.
-
-$Id$
 """
 
-############################################################################
-#     Copyright
-#
-#       Copyright 1996 Digital Creations, L.C., 910 Princess Anne
-#       Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
-#       rights reserved.
-#
-############################################################################
-__rcs_id__='$Id$'
-__version__='$Revision: 1.10 $'[11:-2]
-
 from DocumentTemplate.DT_Util import parse_params
-str = __builtins__['str']
 from string import strip, join
-import sys
 
 _TNAME_MAPPING = {'comma': ','}
 

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqltest.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqltest.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqltest.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -55,23 +55,10 @@
     'and' or 'or' tag, otherwise, no text is inserted.
 
 '''
-__rcs_id__='$Id$'
 
-############################################################################
-#     Copyright
-#
-#       Copyright 1996 Digital Creations, L.C., 910 Princess Anne
-#       Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
-#       rights reserved.
-#
-############################################################################
-__version__='$Revision: 1.5 $'[11:-2]
-
-import sys
 from DocumentTemplate.DT_Util import ParseError, parse_params, name_param
-str=__builtins__['str']
 
-from string import find, split, join, atoi, atof
+from string import join, atoi, atof
 from types import ListType, TupleType, StringType
 
 class SQLTest:

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlvar.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlvar.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/sqlvar.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -47,24 +47,12 @@
     however, if x is ommitted or an empty string, then the value
     inserted is 'null'.
 '''
-__rcs_id__='$Id$'
 
-############################################################################
-#     Copyright
-#
-#       Copyright 1996 Digital Creations, L.C., 910 Princess Anne
-#       Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
-#       rights reserved.
-#
-############################################################################
-__version__='$Revision: 1.15 $'[11:-2]
-
 from DocumentTemplate.DT_Util import ParseError, parse_params, name_param
-from string import find, split, join, atoi, atof
+from string import atoi, atof
 
 StringType = str
 
-str = __builtins__['str']
 
 class SQLVar:
     name='sqlvar'

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testResult.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testResult.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testResult.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -1,14 +1,16 @@
-from unittest import TestCase, TestSuite, makeSuite, main
+from unittest import TestCase, TestSuite, makeSuite
 from cStringIO import StringIO
 from ExtensionClass import Base
 from Shared.DC.ZRDB.Results import Results
 from Shared.DC.ZRDB import RDB
 
+
 class Brain:
     def __init__(self, *args): pass
 
 Parent = Base()
 
+
 class TestResults(TestCase):
 
     def test_results(self):
@@ -63,6 +65,3 @@
 
 def test_suite():
     return TestSuite((makeSuite(TestResults),))
-
-if __name__ == '__main__':
-    main(defaultTest='test_suite')

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testTM.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testTM.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/testTM.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -27,4 +27,3 @@
 
 def test_suite():
     return TestSuite((makeSuite(TestTM),))
-

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_results.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_results.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_results.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -1,6 +1,4 @@
 """ Unit tests for Products.RHGDelivery.simpleresults
-
-$Id: test_results.py,v 1.2 2005/09/07 21:25:47 tseaver Exp $
 """
 import unittest
 
@@ -188,6 +186,3 @@
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestResults))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlgroup.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlgroup.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlgroup.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -12,11 +12,11 @@
 ##############################################################################
 import unittest
 
-from UserDict import UserDict
 
 def _sql_quote(v):
     return '"%s"' % v
 
+
 class SQLGroupTests(unittest.TestCase):
 
     def _getTargetClass(self):
@@ -206,6 +206,3 @@
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SQLGroupTests))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlvar.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlvar.py	2010-07-09 20:05:21 UTC (rev 114416)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/tests/test_sqlvar.py	2010-07-09 20:11:42 UTC (rev 114417)
@@ -14,9 +14,11 @@
 
 from UserDict import UserDict
 
+
 def _sql_quote(v):
     return '"%s"' % v
 
+
 class FauxMultiDict(UserDict):
 
     def getitem(self, key, call):
@@ -29,6 +31,7 @@
                 v = v()
         return v
 
+
 class SQLVarTests(unittest.TestCase):
 
     def _getTargetClass(self):
@@ -131,6 +134,3 @@
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SQLVarTests))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')



More information about the checkins mailing list