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

[jinty at codespeak.net]

Author: jinty
Date: Fri Apr 21 15:14:55 2006
New Revision: 26099

Modified:
   z3/sqlos/trunk/src/sqlos/README.txt
   z3/sqlos/trunk/src/sqlos/__init__.py
   z3/sqlos/trunk/src/sqlos/testing/sampleperson.py
   z3/sqlos/trunk/src/sqlos/tests/test_doctests.py
Log:
move sqlos._sqlos to sqlos.zsqlobject and softly deprecate the import of SQLOS from sqlos.

Modified: z3/sqlos/trunk/src/sqlos/README.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/README.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/README.txt	Fri Apr 21 15:14:55 2006
@@ -198,7 +198,7 @@
 
     >>> from zope.interface import implements
     >>> from sqlobject import *
-    >>> from sqlos import SQLOS
+    >>> from sqlos.zsqlobject import SQLOS
 
     >>> class Person(SQLOS):
     ...     implements(IPerson)

Modified: z3/sqlos/trunk/src/sqlos/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/__init__.py	(original)
+++ z3/sqlos/trunk/src/sqlos/__init__.py	Fri Apr 21 15:14:55 2006
@@ -16,7 +16,10 @@
 import zope.component
 from sqlobject.sqlbuilder import registerConverter
 
-from _sqlos import SQLOS
+# 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
 
 def caller(n=1):
     """Return the name of the calling function n levels up in the frame stack.

Modified: z3/sqlos/trunk/src/sqlos/testing/sampleperson.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/testing/sampleperson.py	(original)
+++ z3/sqlos/trunk/src/sqlos/testing/sampleperson.py	Fri Apr 21 15:14:55 2006
@@ -4,7 +4,7 @@
 from zope.schema import TextLine, Text, Datetime
 from zope.app.container import constraints
 
-from sqlos import SQLOS
+from sqlos.zsqlobject import SQLOS
 from sqlos.interfaces import ISQLSchema, IISQLObjectIsolated, ISQLObjectIsolated
 from sqlos.interfaces.container import ISQLObjectContainer
 from sqlos.container import SQLObjectContainer, SQLIsolatedContainer

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	Fri Apr 21 15:14:55 2006
@@ -26,5 +26,5 @@
             DocTestSuite('sqlos.container', optionflags=doctest.ELLIPSIS),
             DocTestSuite('sqlos.connection'),
             DocTestSuite('sqlos._transaction'),
-            DocTestSuite('sqlos._sqlos')
+            DocTestSuite('sqlos.zsqlobject')
             ])