[Python-checkins] r43471 - in python/branches/sqlite-integration: Lib/db Lib/sqlite3 Lib/sqlite3/dbapi2.py Lib/sqlite3/test/dbapi.py Lib/sqlite3/test/factory.py Lib/sqlite3/test/transactions.py Lib/sqlite3/test/types.py Lib/sqlite3/test/userfunctions.py Lib/test/test_sqlite.py Modules/_sqlite/module.c setup.py

Fri Mar 31 09:12:54 CEST 2006

Author: anthony.baxter
Date: Fri Mar 31 09:12:52 2006
New Revision: 43471
Added:
 python/branches/sqlite-integration/Lib/sqlite3/
 - copied from r43469, python/branches/sqlite-integration/Lib/db/sqlite/
Removed:
 python/branches/sqlite-integration/Lib/db/
Modified:
 python/branches/sqlite-integration/Lib/sqlite3/dbapi2.py
 python/branches/sqlite-integration/Lib/sqlite3/test/dbapi.py
 python/branches/sqlite-integration/Lib/sqlite3/test/factory.py
 python/branches/sqlite-integration/Lib/sqlite3/test/transactions.py
 python/branches/sqlite-integration/Lib/sqlite3/test/types.py
 python/branches/sqlite-integration/Lib/sqlite3/test/userfunctions.py
 python/branches/sqlite-integration/Lib/test/test_sqlite.py
 python/branches/sqlite-integration/Modules/_sqlite/module.c
 python/branches/sqlite-integration/setup.py
Log:
Move db.sqlite to sqlite3. Rename _sqlite to _sqlite3. Fix test suite to 
run under testrunner (oops).
Modified: python/branches/sqlite-integration/Lib/sqlite3/dbapi2.py
==============================================================================

--- python/branches/sqlite-integration/Lib/db/sqlite/dbapi2.py	(original)
+++ python/branches/sqlite-integration/Lib/sqlite3/dbapi2.py	Fri Mar 31 09:12:52 2006
@@ -29,7 +29,7 @@
 
 apilevel = "2.0"
 
-from _sqlite import *
+from _sqlite3 import *
 
 import datetime, time
 
Modified: python/branches/sqlite-integration/Lib/sqlite3/test/dbapi.py
==============================================================================
--- python/branches/sqlite-integration/Lib/db/sqlite/test/dbapi.py	(original)
+++ python/branches/sqlite-integration/Lib/sqlite3/test/dbapi.py	Fri Mar 31 09:12:52 2006
@@ -23,7 +23,7 @@
 
 import unittest
 import threading
-from db import sqlite
+import sqlite3 as sqlite
 
 class ModuleTests(unittest.TestCase):
 def CheckAPILevel(self):
Modified: python/branches/sqlite-integration/Lib/sqlite3/test/factory.py
==============================================================================
--- python/branches/sqlite-integration/Lib/db/sqlite/test/factory.py	(original)
+++ python/branches/sqlite-integration/Lib/sqlite3/test/factory.py	Fri Mar 31 09:12:52 2006
@@ -22,7 +22,7 @@
 # 3. This notice may not be removed or altered from any source distribution.
 
 import unittest
-from db import sqlite
+import sqlite3 as sqlite
 
 class MyConnection(sqlite.Connection):
 def __init__(self, *args, **kwargs):
Modified: python/branches/sqlite-integration/Lib/sqlite3/test/transactions.py
==============================================================================
--- python/branches/sqlite-integration/Lib/db/sqlite/test/transactions.py	(original)
+++ python/branches/sqlite-integration/Lib/sqlite3/test/transactions.py	Fri Mar 31 09:12:52 2006
@@ -22,7 +22,7 @@
 # 3. This notice may not be removed or altered from any source distribution.
 
 import os, unittest
-from db import sqlite
+import sqlite3 as sqlite
 
 def get_db_path():
 return "testdb"
Modified: python/branches/sqlite-integration/Lib/sqlite3/test/types.py
==============================================================================
--- python/branches/sqlite-integration/Lib/db/sqlite/test/types.py	(original)
+++ python/branches/sqlite-integration/Lib/sqlite3/test/types.py	Fri Mar 31 09:12:52 2006
@@ -23,7 +23,7 @@
 
 import datetime
 import unittest
-from db import sqlite
+import sqlite3 as sqlite
 
 class SqliteTypeTests(unittest.TestCase):
 def setUp(self):
Modified: python/branches/sqlite-integration/Lib/sqlite3/test/userfunctions.py
==============================================================================
--- python/branches/sqlite-integration/Lib/db/sqlite/test/userfunctions.py	(original)
+++ python/branches/sqlite-integration/Lib/sqlite3/test/userfunctions.py	Fri Mar 31 09:12:52 2006
@@ -23,7 +23,7 @@
 # 3. This notice may not be removed or altered from any source distribution.
 
 import unittest
-from db import sqlite
+import sqlite3 as sqlite
 
 def func_returntext():
 return "foo"
Modified: python/branches/sqlite-integration/Lib/test/test_sqlite.py
==============================================================================
--- python/branches/sqlite-integration/Lib/test/test_sqlite.py	(original)
+++ python/branches/sqlite-integration/Lib/test/test_sqlite.py	Fri Mar 31 09:12:52 2006
@@ -1,20 +1,16 @@
+from test.test_support import run_unittest, TestSkipped
 import unittest
+
 try:
- import _sqlite
+ import _sqlite3
 except ImportError:
- from test.test_support import TestSkipped
 raise TestSkipped('no sqlite available')
-from db.sqlite.test import (dbapi, types, userfunctions,
+from sqlite3.test import (dbapi, types, userfunctions,
 factory, transactions)
 
-def suite():
- return unittest.TestSuite(
- (dbapi.suite(), types.suite(), userfunctions.suite(),
- factory.suite(), transactions.suite()))
-
-def test():
- runner = unittest.TextTestRunner()
- runner.run(suite())
+def test_main():
+ run_unittest(dbapi.suite(), types.suite(), userfunctions.suite(),
+ factory.suite(), transactions.suite())
 
 if __name__ == "__main__":
- test()
+ test_main()
Modified: python/branches/sqlite-integration/Modules/_sqlite/module.c
==============================================================================
--- python/branches/sqlite-integration/Modules/_sqlite/module.c	(original)
+++ python/branches/sqlite-integration/Modules/_sqlite/module.c	Fri Mar 31 09:12:52 2006
@@ -175,12 +175,12 @@
 {NULL, NULL}
 };
 
-PyMODINIT_FUNC init_sqlite(void)
+PyMODINIT_FUNC init_sqlite3(void)
 {
 PyObject *module, *dict;
 PyObject* time_module;
 
- module = Py_InitModule("_sqlite", module_methods);
+ module = Py_InitModule("_sqlite3", module_methods);
 
 if (
 (row_setup_types() < 0) ||
@@ -213,38 +213,38 @@
 
 /*** Create DB-API Exception hierarchy */
 
- Error = PyErr_NewException("pysqlite2.dbapi2.Error", PyExc_StandardError, NULL);
+ Error = PyErr_NewException("sqlite3.Error", PyExc_StandardError, NULL);
 PyDict_SetItemString(dict, "Error", Error);
 
- Warning = PyErr_NewException("pysqlite2.dbapi2.Warning", PyExc_StandardError, NULL);
+ Warning = PyErr_NewException("sqlite3.Warning", PyExc_StandardError, NULL);
 PyDict_SetItemString(dict, "Warning", Warning);
 
 /* Error subclasses */
 
- InterfaceError = PyErr_NewException("pysqlite2.dbapi2.InterfaceError", Error, NULL);
+ InterfaceError = PyErr_NewException("sqlite3.InterfaceError", Error, NULL);
 PyDict_SetItemString(dict, "InterfaceError", InterfaceError);
 
- DatabaseError = PyErr_NewException("pysqlite2.dbapi2.DatabaseError", Error, NULL);
+ DatabaseError = PyErr_NewException("sqlite3.DatabaseError", Error, NULL);
 PyDict_SetItemString(dict, "DatabaseError", DatabaseError);
 
 /* DatabaseError subclasses */
 
- InternalError = PyErr_NewException("pysqlite2.dbapi2.InternalError", DatabaseError, NULL);
+ InternalError = PyErr_NewException("sqlite3.InternalError", DatabaseError, NULL);
 PyDict_SetItemString(dict, "InternalError", InternalError);
 
- OperationalError = PyErr_NewException("pysqlite2.dbapi2.OperationalError", DatabaseError, NULL);
+ OperationalError = PyErr_NewException("sqlite3.OperationalError", DatabaseError, NULL);
 PyDict_SetItemString(dict, "OperationalError", OperationalError);
 
- ProgrammingError = PyErr_NewException("pysqlite2.dbapi2.ProgrammingError", DatabaseError, NULL);
+ ProgrammingError = PyErr_NewException("sqlite3.ProgrammingError", DatabaseError, NULL);
 PyDict_SetItemString(dict, "ProgrammingError", ProgrammingError);
 
- IntegrityError = PyErr_NewException("pysqlite2.dbapi2.IntegrityError", DatabaseError,NULL);
+ IntegrityError = PyErr_NewException("sqlite3.IntegrityError", DatabaseError,NULL);
 PyDict_SetItemString(dict, "IntegrityError", IntegrityError);
 
- DataError = PyErr_NewException("pysqlite2.dbapi2.DataError", DatabaseError, NULL);
+ DataError = PyErr_NewException("sqlite3.DataError", DatabaseError, NULL);
 PyDict_SetItemString(dict, "DataError", DataError);
 
- NotSupportedError = PyErr_NewException("pysqlite2.dbapi2.NotSupportedError", DatabaseError, NULL);
+ NotSupportedError = PyErr_NewException("sqlite3.NotSupportedError", DatabaseError, NULL);
 PyDict_SetItemString(dict, "NotSupportedError", NotSupportedError);
 
 Py_INCREF((PyObject*)&PyCell_Type);
@@ -285,6 +285,6 @@
 error:
 if (PyErr_Occurred())
 {
- PyErr_SetString(PyExc_ImportError, "pysqlite2._sqlite: init failed");
+ PyErr_SetString(PyExc_ImportError, "_sqlite3: init failed");
 }
 }
Modified: python/branches/sqlite-integration/setup.py
==============================================================================
--- python/branches/sqlite-integration/setup.py	(original)
+++ python/branches/sqlite-integration/setup.py	Fri Mar 31 09:12:52 2006
@@ -757,7 +757,7 @@
 sqlite_defines.append(('PY_MINOR_VERSION', 
 str(sys.version_info[1])))
 
- exts.append(Extension('_sqlite', sqlite_srcs,
+ exts.append(Extension('_sqlite3', sqlite_srcs,
 define_macros=sqlite_defines,
 include_dirs=["Modules/_sqlite", 
 sqlite_incdir],
