[z3-checkins] r36298 - in z3/sqlos/trunk/src/sqlos: . tests

[kobold at codespeak.net]

Author: kobold
Date: Mon Jan  8 17:58:39 2007
New Revision: 36298

Modified:
   z3/sqlos/trunk/src/sqlos/__init__.py
   z3/sqlos/trunk/src/sqlos/configure.zcml
   z3/sqlos/trunk/src/sqlos/ftesting.zcml
   z3/sqlos/trunk/src/sqlos/meta.zcml
   z3/sqlos/trunk/src/sqlos/sampleapp.zcml
   z3/sqlos/trunk/src/sqlos/tests/__init__.py
   z3/sqlos/trunk/src/sqlos/tests/test_doctests.py
   z3/sqlos/trunk/src/sqlos/tests/test_transaction.py
   z3/sqlos/trunk/src/sqlos/tests/test_verify.py
Log:
Minor/cosmetic changes and deprecation warnings.


Modified: z3/sqlos/trunk/src/sqlos/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/__init__.py	(original)
+++ z3/sqlos/trunk/src/sqlos/__init__.py	Mon Jan  8 17:58:39 2007
@@ -10,24 +10,7 @@
 $Id$
 """
 
-from datetime import datetime, date
-from sqlobject.sqlbuilder import registerConverter
+from zope.deprecation import deprecated
 
-# sqlos.SQLOS is softly deprecated, will go away sometime
-# (after at least one major release with deprecation warnings)
-# import directly from sqlos.zsqlobject
 from sqlos.zsqlobject import SQLOS
-
-
-## XXX: What are these?? I am sure there are no tests for them. - jinty
-def DateTimeConverter(value, db=None):
-    return repr(value.isoformat())
-
-registerConverter(datetime, DateTimeConverter)
-
-def DateConverter(value, db=None):
-    if isinstance(value, datetime):
-        return repr(value.date().isoformat())
-    return repr(value.isoformat())
-
-registerConverter(date, DateConverter)
+deprecated('SQLOS', 'sqlos.SQLOS is deprecated and will go away in next release')

Modified: z3/sqlos/trunk/src/sqlos/configure.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/configure.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/configure.zcml	Mon Jan  8 17:58:39 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:zcml="http://namespaces.zope.org/zcml"
            xmlns:browser="http://namespaces.zope.org/browser"

Modified: z3/sqlos/trunk/src/sqlos/ftesting.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftesting.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/ftesting.zcml	Mon Jan  8 17:58:39 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <configure
     xmlns='http://namespaces.zope.org/zope'
     xmlns:rdb='http://namespaces.zope.org/rdb'

Modified: z3/sqlos/trunk/src/sqlos/meta.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/meta.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/meta.zcml	Mon Jan  8 17:58:39 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <configure xmlns='http://namespaces.zope.org/zope'
            xmlns:meta="http://namespaces.zope.org/meta"
            i18n_domain="sqlos">

Modified: z3/sqlos/trunk/src/sqlos/sampleapp.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/sampleapp.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/sampleapp.zcml	Mon Jan  8 17:58:39 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0"?
 <configure xmlns="http://namespaces.zope.org/zope"
            i18n_domain="sqlos">
 

Modified: z3/sqlos/trunk/src/sqlos/tests/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/tests/__init__.py	(original)
+++ z3/sqlos/trunk/src/sqlos/tests/__init__.py	Mon Jan  8 17:58:39 2007
@@ -1 +0,0 @@
-# import this

Modified: z3/sqlos/trunk/src/sqlos/tests/test_doctests.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/tests/test_doctests.py	(original)
+++ z3/sqlos/trunk/src/sqlos/tests/test_doctests.py	Mon Jan  8 17:58:39 2007
@@ -28,3 +28,6 @@
             DocTestSuite('sqlos._transaction'),
             DocTestSuite('sqlos.zsqlobject')
             ])
+
+if __name__=='__main__':
+    unittest.TextTestRunner().run(test_suite())

Modified: z3/sqlos/trunk/src/sqlos/tests/test_transaction.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/tests/test_transaction.py	(original)
+++ z3/sqlos/trunk/src/sqlos/tests/test_transaction.py	Mon Jan  8 17:58:39 2007
@@ -18,6 +18,7 @@
 from zope.testing.doctestunit import DocTestSuite
 from transaction import get, begin
 
+
 def doctest_KeepValuesOverExpireSync():
     """Regression test for a SQLObject bug in expire.
 
@@ -62,9 +63,10 @@
         >>> tearDown()
     """
 
-
 def test_suite():
     return unittest.TestSuite([
             DocTestSuite(),
             ])
 
+if __name__=='__main__':
+    unittest.TextTestRunner().run(test_suite())

Modified: z3/sqlos/trunk/src/sqlos/tests/test_verify.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/tests/test_verify.py	(original)
+++ z3/sqlos/trunk/src/sqlos/tests/test_verify.py	Mon Jan  8 17:58:39 2007
@@ -16,17 +16,15 @@
 $Id$
 """
 
-from zope.interface import Interface, implements, classImplements
+import unittest
+
 from zope.interface.verify import verifyClass, verifyObject
-from zope.interface.exceptions import DoesNotImplement, BrokenImplementation
-from zope.interface.exceptions import BrokenMethodImplementation
+
 from sqlobject.dbconnection import DBConnection, DBAPI
 from sqlobject import _mysql, _postgres, _sybase
 from sqlobject.main import SQLObject
-from sqlos.interfaces import IDBConnection, \
-     IDBAPI, ISQLConnection, ISQLObject
+from sqlos.interfaces import IDBConnection, IDBAPI, ISQLConnection, ISQLObject
 
-import unittest
 
 class Test(unittest.TestCase):
 
@@ -34,7 +32,7 @@
         self.failUnless(verifyClass(ISQLObject, SQLObject))
 
     def testDBConnection(self):
-        self.failUnless(verifyClass(IDBConnection, DBConnection ))
+        self.failUnless(verifyClass(IDBConnection, DBConnection))
 
     def testDBAPI(self):
         self.failUnless(verifyClass(IDBAPI, DBAPI))