sqlobject-cvs — CVS notification

[SQL-CVS] r3959 - SQLObject/trunk/sqlobject/postgres

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:54:18 -0600 (Thu, 13 Aug 2009)
New Revision: 3959

Modified:
   SQLObject/trunk/sqlobject/postgres/pgconnection.py
Log:
SET client_encoding TO the value of '?charset=' parameter in DB URI.


Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py	2009-08-13 16:53:03 UTC (rev 3958)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py	2009-08-13 16:54:18 UTC (rev 3959)
@@ -86,6 +86,10 @@
         self.dsn = dsn
         self.unicodeCols = unicodeCols
         self.schema = kw.pop('schema', None)
+        if "charset" in kw:
+            self.dbEncoding = self.kw["charset"] = kw.pop("charset")
+        else:
+            self.dbEncoding = None
         DBAPI.__init__(self, **kw)
 
     def connectionFromURI(cls, uri):
@@ -118,6 +122,9 @@
         if self.schema:
             c = conn.cursor()
             c.execute("SET search_path TO " + self.schema)
+        dbEncoding = self.dbEncoding
+        if dbEncoding:
+            conn.query("SET client_encoding TO %s" % dbEncoding)
         return conn
 
     def _queryInsertID(self, conn, soInstance, id, names, values):

[SQL-CVS] r3958 - SQLObject/trunk/sqlobject

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:53:03 -0600 (Thu, 13 Aug 2009)
New Revision: 3958

Modified:
   SQLObject/trunk/sqlobject/dbconnection.py
Log:
Register DB URI schemas.


Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	2009-08-13 16:52:11 UTC (rev 3957)
+++ SQLObject/trunk/sqlobject/dbconnection.py	2009-08-13 16:53:03 UTC (rev 3958)
@@ -950,3 +950,12 @@
 registerConnectionInstance = TheURIOpener.registerConnectionInstance
 connectionForURI = TheURIOpener.connectionForURI
 dbConnectionForScheme = TheURIOpener.dbConnectionForScheme
+
+# Register DB URI schemas
+import firebird
+import maxdb
+import mssql
+import mysql
+import postgres
+import sqlite
+import sybase

[SQL-CVS] r3957 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:52:11 -0600 (Thu, 13 Aug 2009)
New Revision: 3957

Modified:
   SQLObject/trunk/sqlobject/tests/test_unicode.py
Log:
SET client_encoding TO latin1 for Postgres to fix the test.


Modified: SQLObject/trunk/sqlobject/tests/test_unicode.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_unicode.py	2009-08-13 16:51:17 UTC (rev 3956)
+++ SQLObject/trunk/sqlobject/tests/test_unicode.py	2009-08-13 16:52:11 UTC (rev 3957)
@@ -17,7 +17,8 @@
     global items
     items = []
     setupClass(TestUnicode)
-    TestUnicode._connection.query('SET client_encoding TO latin1')
+    if TestUnicode._connection.dbName == 'postgres':
+        TestUnicode._connection.query('SET client_encoding TO latin1')
     for i, n in enumerate(data):
         items.append(TestUnicode(count=i, col1=n, col2=n))
 

[SQL-CVS] r3956 - SQLObject/branches/0.11/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:51:17 -0600 (Thu, 13 Aug 2009)
New Revision: 3956

Modified:
   SQLObject/branches/0.11/sqlobject/tests/test_unicode.py
Log:
...but only for Postgres...


Modified: SQLObject/branches/0.11/sqlobject/tests/test_unicode.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/tests/test_unicode.py	2009-08-13 16:50:54 UTC (rev 3955)
+++ SQLObject/branches/0.11/sqlobject/tests/test_unicode.py	2009-08-13 16:51:17 UTC (rev 3956)
@@ -17,7 +17,8 @@
     global items
     items = []
     setupClass(TestUnicode)
-    TestUnicode._connection.query('SET client_encoding TO latin1')
+    if TestUnicode._connection.dbName == 'postgres':
+        TestUnicode._connection.query('SET client_encoding TO latin1')
     for i, n in enumerate(data):
         items.append(TestUnicode(count=i, col1=n, col2=n))
 

[SQL-CVS] r3955 - SQLObject/branches/0.10/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:50:54 -0600 (Thu, 13 Aug 2009)
New Revision: 3955

Modified:
   SQLObject/branches/0.10/sqlobject/tests/test_unicode.py
Log:
...but only for Postgres...


Modified: SQLObject/branches/0.10/sqlobject/tests/test_unicode.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/tests/test_unicode.py	2009-08-13 16:48:40 UTC (rev 3954)
+++ SQLObject/branches/0.10/sqlobject/tests/test_unicode.py	2009-08-13 16:50:54 UTC (rev 3955)
@@ -17,7 +17,8 @@
     global items
     items = []
     setupClass(TestUnicode)
-    TestUnicode._connection.query('SET client_encoding TO latin1')
+    if TestUnicode._connection.dbName == 'postgres':
+        TestUnicode._connection.query('SET client_encoding TO latin1')
     for i, n in enumerate(data):
         items.append(TestUnicode(count=i, col1=n, col2=n))
 

[SQL-CVS] r3954 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:48:40 -0600 (Thu, 13 Aug 2009)
New Revision: 3954

Modified:
   SQLObject/trunk/sqlobject/tests/test_unicode.py
Log:
SET client_encoding TO latin1 to fix the test.


Modified: SQLObject/trunk/sqlobject/tests/test_unicode.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_unicode.py	2009-08-13 16:48:12 UTC (rev 3953)
+++ SQLObject/trunk/sqlobject/tests/test_unicode.py	2009-08-13 16:48:40 UTC (rev 3954)
@@ -17,6 +17,7 @@
     global items
     items = []
     setupClass(TestUnicode)
+    TestUnicode._connection.query('SET client_encoding TO latin1')
     for i, n in enumerate(data):
         items.append(TestUnicode(count=i, col1=n, col2=n))
 

[SQL-CVS] r3953 - SQLObject/branches/0.11/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:48:12 -0600 (Thu, 13 Aug 2009)
New Revision: 3953

Modified:
   SQLObject/branches/0.11/sqlobject/tests/test_unicode.py
Log:
SET client_encoding TO latin1 to fix the test.


Modified: SQLObject/branches/0.11/sqlobject/tests/test_unicode.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/tests/test_unicode.py	2009-08-13 16:47:10 UTC (rev 3952)
+++ SQLObject/branches/0.11/sqlobject/tests/test_unicode.py	2009-08-13 16:48:12 UTC (rev 3953)
@@ -17,6 +17,7 @@
     global items
     items = []
     setupClass(TestUnicode)
+    TestUnicode._connection.query('SET client_encoding TO latin1')
     for i, n in enumerate(data):
         items.append(TestUnicode(count=i, col1=n, col2=n))
 

[SQL-CVS] r3952 - SQLObject/branches/0.10/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:47:10 -0600 (Thu, 13 Aug 2009)
New Revision: 3952

Modified:
   SQLObject/branches/0.10/sqlobject/tests/test_unicode.py
Log:
SET client_encoding TO latin1 to fix the test.


Modified: SQLObject/branches/0.10/sqlobject/tests/test_unicode.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/tests/test_unicode.py	2009-08-13 16:33:10 UTC (rev 3951)
+++ SQLObject/branches/0.10/sqlobject/tests/test_unicode.py	2009-08-13 16:47:10 UTC (rev 3952)
@@ -17,6 +17,7 @@
     global items
     items = []
     setupClass(TestUnicode)
+    TestUnicode._connection.query('SET client_encoding TO latin1')
     for i, n in enumerate(data):
         items.append(TestUnicode(count=i, col1=n, col2=n))
 

[SQL-CVS] r3951 - SQLObject/trunk/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:33:10 -0600 (Thu, 13 Aug 2009)
New Revision: 3951

Modified:
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
Removed deprecated parameter.


Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2009-08-13 16:32:31 UTC (rev 3950)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2009-08-13 16:33:10 UTC (rev 3951)
@@ -1,7 +1,6 @@
 from sqlobject import col
 from sqlobject.dbconnection import DBAPI
 from sqlobject.dberrors import *
-from sqlobject.main import deprecated
 MySQLdb = None
 
 class ErrorMessage(str):
@@ -46,9 +45,6 @@
             self.dbEncoding = self.kw["charset"] = kw.pop("charset")
         else:
             self.dbEncoding = None
-        if "sqlobject_encoding" in kw:
-            del kw["sqlobject_encoding"]
-            deprecated("sqlobject_encoding is deprecated and no longer used.")
 
         # MySQLdb < 1.2.1: only ascii
         # MySQLdb = 1.2.1: only unicode

[SQL-CVS] r3950 - SQLObject/trunk/sqlobject

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:32:31 -0600 (Thu, 13 Aug 2009)
New Revision: 3950

Modified:
   SQLObject/trunk/sqlobject/__init__.py
Log:
Fixed circular import problem.


Modified: SQLObject/trunk/sqlobject/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/__init__.py	2009-08-13 16:15:48 UTC (rev 3949)
+++ SQLObject/trunk/sqlobject/__init__.py	2009-08-13 16:32:31 UTC (rev 3950)
@@ -2,11 +2,11 @@
 SQLObject 0.12
 """
 
-from dbconnection import connectionForURI
 from col import *
 from index import *
 from joins import *
 from main import *
 from sqlbuilder import AND, OR, NOT, IN, LIKE, RLIKE, DESC, CONTAINSSTRING, const, func
 from styles import *
+from dbconnection import connectionForURI
 import dberrors

[SQL-CVS] r3949 - in SQLObject/trunk: docs sqlobject

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:15:48 -0600 (Thu, 13 Aug 2009)
New Revision: 3949

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/__init__.py
Log:
Removed deprecated functions.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-08-13 16:02:37 UTC (rev 3948)
+++ SQLObject/trunk/docs/News.txt	2009-08-13 16:15:48 UTC (rev 3949)
@@ -13,7 +13,7 @@
 Features & Interface
 --------------------
 
-* Removed the last remaininig deprecated attribute.
+* Removed deprecated attribute and functions.
 
 SQLObject 0.11
 ==============

Modified: SQLObject/trunk/sqlobject/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/__init__.py	2009-08-13 16:02:37 UTC (rev 3948)
+++ SQLObject/trunk/sqlobject/__init__.py	2009-08-13 16:15:48 UTC (rev 3949)
@@ -2,53 +2,11 @@
 SQLObject 0.12
 """
 
-from main import *
+from dbconnection import connectionForURI
 from col import *
+from index import *
+from joins import *
+from main import *
 from sqlbuilder import AND, OR, NOT, IN, LIKE, RLIKE, DESC, CONTAINSSTRING, const, func
 from styles import *
-from joins import *
-from index import *
-from dbconnection import connectionForURI
 import dberrors
-
-## Each of these imports allows the driver to install itself
-## Then we set up some backward compatibility
-
-def _warn(msg):
-    import warnings
-    warnings.warn(msg, DeprecationWarning, stacklevel=2)
-
-import firebird as _firebird
-def FirebirdConnection(*args, **kw):
-    _warn('FirebirdConnection is deprecated; use connectionForURI("firebird://...") or "from sqlobject.firebird import builder; FirebirdConnection = builder()"')
-    return _firebird.builder()(*args, **kw)
-
-import mysql as _mysql
-def MySQLConnection(*args, **kw):
-    _warn('MySQLConnection is deprecated; use connectionForURI("mysql://...") or "from sqlobject.mysql import builder; MySQLConnection = builder()"')
-    return _mysql.builder()(*args, **kw)
-
-import postgres as _postgres
-def PostgresConnection(*args, **kw):
-    _warn('PostgresConnection is deprecated; use connectionForURI("postgres://...") or "from sqlobject.postgres import builder; PostgresConnection = builder()"')
-    return _postgres.builder()(*args, **kw)
-
-import sqlite as _sqlite
-def SQLiteConnection(*args, **kw):
-    _warn('SQLiteConnection is deprecated; use connectionForURI("sqlite://...") or "from sqlobject.sqlite import builder; SQLiteConnection = builder()"')
-    return _sqlite.builder()(*args, **kw)
-
-import sybase as _sybase
-def SybaseConnection(*args, **kw):
-    _warn('SybaseConnection is deprecated; use connectionForURI("sybase://...") or "from sqlobject.sybase import builder; SybaseConnection = builder()"')
-    return _sybase.builder()(*args, **kw)
-
-import maxdb as _maxdb
-def MaxdbConnection(*args, **kw):
-    _warn('MaxdbConnection is deprecated; use connectionForURI("maxdb://...") or "from sqlobject.maxdb import builder; MaxdbConnection = builder()"')
-    return _maxdb.builder()(*args, **kw)
-
-import mssql as _mssql
-def MSSQLConnection(*args, **kw):
-        _warn('MssqlConnection is deprecated; use connectionForURI("mssql://...") or "from sqlobject.mssql import builder; MSSQLConnection = builder()"')
-        return _mssql.builder()(*args, **kw)

[SQL-CVS] r3948 - in SQLObject/trunk: docs sqlobject

[<sub...@co...>]

Author: phd
Date: 2009-08-13 10:02:37 -0600 (Thu, 13 Aug 2009)
New Revision: 3948

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
Log:
Removed the last remaininig deprecated attribute.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-08-12 10:40:32 UTC (rev 3947)
+++ SQLObject/trunk/docs/News.txt	2009-08-13 16:02:37 UTC (rev 3948)
@@ -10,6 +10,11 @@
 SQLObject (trunk)
 =================
 
+Features & Interface
+--------------------
+
+* Removed the last remaininig deprecated attribute.
+
 SQLObject 0.11
 ==============
 

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2009-08-12 10:40:32 UTC (rev 3947)
+++ SQLObject/trunk/sqlobject/main.py	2009-08-13 16:02:37 UTC (rev 3948)
@@ -658,9 +658,9 @@
 warnings_level = 1
 exception_level = None
 # Current levels:
-#  1) Actively deprecated in version after 0.9; removed after
-#  2) Deprecated after 1 (0.9?)
-#  3) Deprecated after 2 (0.10?)
+#  1) Actively deprecated
+#  2) Deprecated after 1
+#  3) Deprecated after 2
 
 def deprecated(message, level=1, stacklevel=2):
     if exception_level is not None and exception_level <= level:
@@ -814,8 +814,6 @@
 
         classregistry.registry(cls.sqlmeta.registry).addClass(cls)
 
-    _expired = _sqlmeta_attr('expired', 1)
-
     # @classmethod
     def _SO_setupSqlmeta(cls, new_attrs, is_base):
         """
@@ -866,7 +864,7 @@
         been deprecated; they are moved to the sqlmeta class, and
         a deprecation warning is given.
         """
-        for attr in ['_expired']:
+        for attr in ():
             if new_attrs.has_key(attr):
                 deprecated("%r is deprecated and read-only; please do "
                            "not use it in your classes until it is fully "

[SQL-CVS] r3947 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: 2009-08-12 04:40:32 -0600 (Wed, 12 Aug 2009)
New Revision: 3947

Modified:
   SQLObject/trunk/docs/News.txt
Log:
SQLObject 0.11 released 12 Aug 2009


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-08-12 10:18:24 UTC (rev 3946)
+++ SQLObject/trunk/docs/News.txt	2009-08-12 10:40:32 UTC (rev 3947)
@@ -13,6 +13,8 @@
 SQLObject 0.11
 ==============
 
+Released 12 Aug 2009
+
 Features & Interface
 --------------------
 

[SQL-CVS] r3946 - in SQLObject/tags/0.11.0: . sqlobject

[<sub...@co...>]

Author: phd
Date: 2009-08-12 04:18:24 -0600 (Wed, 12 Aug 2009)
New Revision: 3946

Modified:
   SQLObject/tags/0.11.0/setup.cfg
   SQLObject/tags/0.11.0/setup.py
   SQLObject/tags/0.11.0/sqlobject/__init__.py
   SQLObject/tags/0.11.0/sqlobject/main.py
Log:
Stable version 0.11.0.


Modified: SQLObject/tags/0.11.0/setup.cfg
===================================================================
--- SQLObject/tags/0.11.0/setup.cfg	2009-08-12 10:16:52 UTC (rev 3945)
+++ SQLObject/tags/0.11.0/setup.cfg	2009-08-12 10:18:24 UTC (rev 3946)
@@ -5,10 +5,6 @@
 [easy_install]
 #find_links = http://svn.pythonpaste.org/package_index.html
 
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
 [pudge]
 theme = pythonpaste.org
 docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt

Modified: SQLObject/tags/0.11.0/setup.py
===================================================================
--- SQLObject/tags/0.11.0/setup.py	2009-08-12 10:16:52 UTC (rev 3945)
+++ SQLObject/tags/0.11.0/setup.py	2009-08-12 10:18:24 UTC (rev 3946)
@@ -21,7 +21,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.11",
+      version="0.11.0",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an

Modified: SQLObject/tags/0.11.0/sqlobject/__init__.py
===================================================================
--- SQLObject/tags/0.11.0/sqlobject/__init__.py	2009-08-12 10:16:52 UTC (rev 3945)
+++ SQLObject/tags/0.11.0/sqlobject/__init__.py	2009-08-12 10:18:24 UTC (rev 3946)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.11
+SQLObject 0.11.0
 """
 
 from main import *

Modified: SQLObject/tags/0.11.0/sqlobject/main.py
===================================================================
--- SQLObject/tags/0.11.0/sqlobject/main.py	2009-08-12 10:16:52 UTC (rev 3945)
+++ SQLObject/tags/0.11.0/sqlobject/main.py	2009-08-12 10:18:24 UTC (rev 3946)
@@ -1,6 +1,6 @@
 """
-SQLObject 0.11
---------------
+SQLObject 0.11.0
+----------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r3945 - SQLObject/tags

[<sub...@co...>]

Author: phd
Date: 2009-08-12 04:16:52 -0600 (Wed, 12 Aug 2009)
New Revision: 3945

Added:
   SQLObject/tags/0.11.0/
Log:
Tagging 0.11.0

Copied: SQLObject/tags/0.11.0 (from rev 3944, SQLObject/branches/0.11)

[SQL-CVS] r3944 - SQLObject/branches/0.11/docs

[<sub...@co...>]

Author: phd
Date: 2009-08-12 04:15:02 -0600 (Wed, 12 Aug 2009)
New Revision: 3944

Modified:
   SQLObject/branches/0.11/docs/News.txt
Log:
SQLObject 0.11.0 released 12 Aug 2009.


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2009-08-06 17:20:43 UTC (rev 3943)
+++ SQLObject/branches/0.11/docs/News.txt	2009-08-12 10:15:02 UTC (rev 3944)
@@ -10,6 +10,8 @@
 SQLObject 0.11.0
 ================
 
+Released 12 Aug 2009
+
 Features & Interface
 --------------------
 

[SQL-CVS] r3940 - in SQLObject/trunk: . docs sqlobject

[<sub...@co...>]

Author: phd
Date: 2009-08-05 11:08:43 -0600 (Wed, 05 Aug 2009)
New Revision: 3940

Modified:
   SQLObject/trunk/README.txt
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/setup.py
   SQLObject/trunk/sqlobject/__init__.py
   SQLObject/trunk/sqlobject/main.py
Log:
The trunk will be SQLObject 0.12.


Modified: SQLObject/trunk/README.txt
===================================================================
--- SQLObject/trunk/README.txt	2009-08-05 16:28:55 UTC (rev 3939)
+++ SQLObject/trunk/README.txt	2009-08-05 17:08:43 UTC (rev 3940)
@@ -1,4 +1,4 @@
-SQLObject 0.11
+SQLObject 0.12
 ==============
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational

Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-08-05 16:28:55 UTC (rev 3939)
+++ SQLObject/trunk/docs/News.txt	2009-08-05 17:08:43 UTC (rev 3940)
@@ -10,6 +10,9 @@
 SQLObject (trunk)
 =================
 
+SQLObject 0.11
+==============
+
 Features & Interface
 --------------------
 

Modified: SQLObject/trunk/setup.py
===================================================================
--- SQLObject/trunk/setup.py	2009-08-05 16:28:55 UTC (rev 3939)
+++ SQLObject/trunk/setup.py	2009-08-05 17:08:43 UTC (rev 3940)
@@ -21,7 +21,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.11",
+      version="0.12",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an
@@ -35,7 +35,7 @@
 Supports MySQL, PostgreSQL, SQLite, Firebird, Sybase, MSSQL and MaxDB (SAPDB).
 
 For development see the `subversion repository
-<http://svn.colorstudy.com/SQLObject/trunk#egg=SQLObject-0.11dev>`_
+<http://svn.colorstudy.com/SQLObject/trunk#egg=SQLObject-0.12dev>`_
 """,
       classifiers=[
         "Development Status :: 5 - Production/Stable",

Modified: SQLObject/trunk/sqlobject/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/__init__.py	2009-08-05 16:28:55 UTC (rev 3939)
+++ SQLObject/trunk/sqlobject/__init__.py	2009-08-05 17:08:43 UTC (rev 3940)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.11
+SQLObject 0.12
 """
 
 from main import *

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2009-08-05 16:28:55 UTC (rev 3939)
+++ SQLObject/trunk/sqlobject/main.py	2009-08-05 17:08:43 UTC (rev 3940)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.11
+SQLObject 0.12
 --------------
 
 :author: Ian Bicking <ia...@co...>

[SQL-CVS] r3939 - in SQLObject/tags/0.11.0b1: . sqlobject

[<sub...@co...>]

Author: phd
Date: 2009-08-05 10:28:55 -0600 (Wed, 05 Aug 2009)
New Revision: 3939

Modified:
   SQLObject/tags/0.11.0b1/setup.cfg
   SQLObject/tags/0.11.0b1/setup.py
   SQLObject/tags/0.11.0b1/sqlobject/__init__.py
   SQLObject/tags/0.11.0b1/sqlobject/main.py
Log:
Version 0.11.0b1.


Modified: SQLObject/tags/0.11.0b1/setup.cfg
===================================================================
--- SQLObject/tags/0.11.0b1/setup.cfg	2009-08-05 16:27:33 UTC (rev 3938)
+++ SQLObject/tags/0.11.0b1/setup.cfg	2009-08-05 16:28:55 UTC (rev 3939)
@@ -5,10 +5,6 @@
 [easy_install]
 #find_links = http://svn.pythonpaste.org/package_index.html
 
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
 [pudge]
 theme = pythonpaste.org
 docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt

Modified: SQLObject/tags/0.11.0b1/setup.py
===================================================================
--- SQLObject/tags/0.11.0b1/setup.py	2009-08-05 16:27:33 UTC (rev 3938)
+++ SQLObject/tags/0.11.0b1/setup.py	2009-08-05 16:28:55 UTC (rev 3939)
@@ -21,7 +21,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.11",
+      version="0.11.0b1",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an
@@ -35,7 +35,7 @@
 Supports MySQL, PostgreSQL, SQLite, Firebird, Sybase, MSSQL and MaxDB (SAPDB).
 
 For development see the `subversion repository
-<http://svn.colorstudy.com/SQLObject/trunk#egg=SQLObject-0.11dev>`_
+<http://svn.colorstudy.com/SQLObject/branches/0.11>`_
 """,
       classifiers=[
         "Development Status :: 5 - Production/Stable",

Modified: SQLObject/tags/0.11.0b1/sqlobject/__init__.py
===================================================================
--- SQLObject/tags/0.11.0b1/sqlobject/__init__.py	2009-08-05 16:27:33 UTC (rev 3938)
+++ SQLObject/tags/0.11.0b1/sqlobject/__init__.py	2009-08-05 16:28:55 UTC (rev 3939)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.11
+SQLObject 0.11.0b1
 """
 
 from main import *

Modified: SQLObject/tags/0.11.0b1/sqlobject/main.py
===================================================================
--- SQLObject/tags/0.11.0b1/sqlobject/main.py	2009-08-05 16:27:33 UTC (rev 3938)
+++ SQLObject/tags/0.11.0b1/sqlobject/main.py	2009-08-05 16:28:55 UTC (rev 3939)
@@ -1,6 +1,6 @@
 """
-SQLObject 0.11
---------------
+SQLObject 0.11.0b1
+------------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r3938 - SQLObject/branches/0.11

[<sub...@co...>]

Author: phd
Date: 2009-08-05 10:27:33 -0600 (Wed, 05 Aug 2009)
New Revision: 3938

Modified:
   SQLObject/branches/0.11/setup.py
Log:
branches/0.11.


Modified: SQLObject/branches/0.11/setup.py
===================================================================
--- SQLObject/branches/0.11/setup.py	2009-08-05 16:23:42 UTC (rev 3937)
+++ SQLObject/branches/0.11/setup.py	2009-08-05 16:27:33 UTC (rev 3938)
@@ -35,7 +35,7 @@
 Supports MySQL, PostgreSQL, SQLite, Firebird, Sybase, MSSQL and MaxDB (SAPDB).
 
 For development see the `subversion repository
-<http://svn.colorstudy.com/SQLObject/trunk#egg=SQLObject-0.11dev>`_
+<http://svn.colorstudy.com/SQLObject/branches/0.11>`_
 """,
       classifiers=[
         "Development Status :: 5 - Production/Stable",

[SQL-CVS] r3937 - SQLObject/tags

[<sub...@co...>]

Author: phd
Date: 2009-08-05 10:23:42 -0600 (Wed, 05 Aug 2009)
New Revision: 3937

Added:
   SQLObject/tags/0.11.0b1/
Log:
Tagging 0.11.0b1

Copied: SQLObject/tags/0.11.0b1 (from rev 3936, SQLObject/branches/0.11)

[SQL-CVS] r3936 - SQLObject/branches/0.11/docs

[<sub...@co...>]

Author: phd
Date: 2009-08-05 10:12:47 -0600 (Wed, 05 Aug 2009)
New Revision: 3936

Modified:
   SQLObject/branches/0.11/docs/News.txt
Log:
SQLObject 0.11.


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2009-08-05 16:07:20 UTC (rev 3935)
+++ SQLObject/branches/0.11/docs/News.txt	2009-08-05 16:12:47 UTC (rev 3936)
@@ -7,8 +7,8 @@
 
 .. _start:
 
-SQLObject (trunk)
-=================
+SQLObject 0.11.0
+================
 
 Features & Interface
 --------------------

[SQL-CVS] r3935 - SQLObject/branches

[<sub...@co...>]

Author: phd
Date: 2009-08-05 10:07:20 -0600 (Wed, 05 Aug 2009)
New Revision: 3935

Added:
   SQLObject/branches/0.11/
Log:
Branch 0.11

Copied: SQLObject/branches/0.11 (from rev 3934, SQLObject/trunk)

[SQL-CVS] r3929 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: 2009-07-25 05:11:46 -0600 (Sat, 25 Jul 2009)
New Revision: 3929

Removed:
   SQLObject/trunk/docs/FAQ.comments.txt
   SQLObject/trunk/docs/SQLObject.comments.txt
   SQLObject/trunk/docs/index.comments.txt
   SQLObject/trunk/docs/sqlobject-admin.comments.txt
Modified:
   SQLObject/trunk/docs/rebuild
Log:
Merged revision 3928 from 0.10 branch: removed old (almost) empty doc files; build all *.txt.


Deleted: SQLObject/trunk/docs/FAQ.comments.txt
===================================================================
--- SQLObject/trunk/docs/FAQ.comments.txt	2009-07-25 11:09:01 UTC (rev 3928)
+++ SQLObject/trunk/docs/FAQ.comments.txt	2009-07-25 11:11:46 UTC (rev 3929)
@@ -1,9 +0,0 @@
-==== $(how-can-i-do-a-left-join)  c +
-----------------------------------------
-date: 2006-01-03T14:32:21
-email: b.n...@rl...
-id: 1
-ip: 86.143.215.248
-username: bryan
-
-Ian, this works fine from Mozilla, but not from konqueror ... what exactly

Deleted: SQLObject/trunk/docs/SQLObject.comments.txt
===================================================================
--- SQLObject/trunk/docs/SQLObject.comments.txt	2009-07-25 11:09:01 UTC (rev 3928)
+++ SQLObject/trunk/docs/SQLObject.comments.txt	2009-07-25 11:11:46 UTC (rev 3929)
@@ -1,63 +0,0 @@
-==== $(left-join-and-other-joins)  c ++
-----------------------------------------
-date: 2005-12-07T08:36:44
-email: mk...@em...
-id: 3
-ip: 208.255.226.178
-username: Mike Kent
-
-It's probably just me, but I'm finding this part quite confusing.  You'd use a left join to join two tables together, but this example refers to THREE tables, MyTable, Table1, and Table2.  I haven't been able to grasp what's going on.
-==== $(one-to-many-relationships)  c ++++
-----------------------------------------
-date: 2005-12-07T08:46:22
-email: mk...@em...
-id: 4
-ip: 208.255.226.178
-username: Mike Kent
-
-If I have this correctly: For a one-to-many relationship, you use 'ForeignKey' on the 'has one' side, and you use 'MultipleJoin' on the 'has many' side.  I found this to be incredibly non-intuitive and confusing.  How about 'hasOneOf' and 'hasManyOf'?  Or would this cause a problem with a many-to-many relationship, since both sides would use 'hasManyOf'?
-==== $(col-class-specifying-columns)  c ++ c +++++ c
-----------------------------------------
-date: 2005-12-07T08:52:14
-email: mk...@em...
-id: 5
-ip: 208.255.226.178
-username: Mike Kent
-
-So if you declare a column as an alternateID, unique is implied, and we don't need to explicitly declare it?shouldn't this be protected???
-==== $(orderby) +
-----------------------------------------
-date: 2005-12-08T10:47:35
-email: ch...@wo...
-id: 9
-ip: 134.84.144.61
-username: Chad Walstrom
-
-Text turned grey here.  This renders the text in the following Note unreadable unless you mouse-over.
-==== $(selecting-multiple-objects)
-----------------------------------------
-date: 2006-01-04T14:47:33
-email: jw...@jw...
-id: 10
-ip: 128.197.24.59
-username: Joe
-
-Think about breaking these SELECT statements onto several lines.  They're busting out of the page design now.
-==== $(col-class-specifying-columns)  c ++ c +++++ c +
-----------------------------------------
-date: 2006-02-02T15:43:28
-email: Man
-id: 11
-ip: 192.100.104.28
-username: Big
-
-StringCol's that are alternateID's must have a length property if you use them in MySQL.
-==== $(relatedjoin-many-to-many)  c ++++
-----------------------------------------
-date: 2006-05-18T14:17:19
-email: we...@or...
-id: 12
-ip: 209.204.147.64
-username: Jonathan Wellons
-
-What is the advantage over traditional relations?

Deleted: SQLObject/trunk/docs/index.comments.txt
===================================================================
--- SQLObject/trunk/docs/index.comments.txt	2009-07-25 11:09:01 UTC (rev 3928)
+++ SQLObject/trunk/docs/index.comments.txt	2009-07-25 11:11:46 UTC (rev 3929)
@@ -1,16 +0,0 @@
-==== $(example)  c
-----------------------------------------
-date: 2006-01-31T06:42:16
-id: 2
-ip: 84.190.227.75
-username: MB
-
-Sie werden jeweils nach Doppelklick gespeichert.
-==== $(example)  c +
-----------------------------------------
-date: 2006-01-31T06:42:36
-id: 3
-ip: 84.190.227.75
-username: MB
-
-Auch an unterschiedlichen Stellen geht das

Modified: SQLObject/trunk/docs/rebuild
===================================================================
--- SQLObject/trunk/docs/rebuild	2009-07-25 11:09:01 UTC (rev 3928)
+++ SQLObject/trunk/docs/rebuild	2009-07-25 11:11:46 UTC (rev 3929)
@@ -7,8 +7,7 @@
 
 NORMAL="Authors DeveloperGuide FAQ Inheritance News
         SQLBuilder SQLObject SelectResults TODO Versioning Views
-        web/index web/links web/repository web/community
-        index community sqlobject-architecture sqlobject-admin"
+        community download index links sqlobject-admin sqlobject-architecture"
 
 for NAME in $NORMAL ; do
     if [ -e "$NAME.html" -a ! "$NAME.html" -ot "$NAME.txt" ] ; then
@@ -19,5 +18,3 @@
     rst2html.py --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
         -- "$NAME.txt" > "$NAME.html"
 done
-
-exec source-highlight -f html interface.py

Deleted: SQLObject/trunk/docs/sqlobject-admin.comments.txt
===================================================================

[SQL-CVS] r3928 - SQLObject/branches/0.10/docs

[<sub...@co...>]

Author: phd
Date: 2009-07-25 05:09:01 -0600 (Sat, 25 Jul 2009)
New Revision: 3928

Removed:
   SQLObject/branches/0.10/docs/FAQ.comments.txt
   SQLObject/branches/0.10/docs/SQLObject.comments.txt
   SQLObject/branches/0.10/docs/index.comments.txt
   SQLObject/branches/0.10/docs/sqlobject-admin.comments.txt
Modified:
   SQLObject/branches/0.10/docs/rebuild
Log:
Removed old (almost) empty doc files; build all *.txt.


Deleted: SQLObject/branches/0.10/docs/FAQ.comments.txt
===================================================================
--- SQLObject/branches/0.10/docs/FAQ.comments.txt	2009-07-25 11:05:09 UTC (rev 3927)
+++ SQLObject/branches/0.10/docs/FAQ.comments.txt	2009-07-25 11:09:01 UTC (rev 3928)
@@ -1,9 +0,0 @@
-==== $(how-can-i-do-a-left-join)  c +
-----------------------------------------
-date: 2006-01-03T14:32:21
-email: b.n...@rl...
-id: 1
-ip: 86.143.215.248
-username: bryan
-
-Ian, this works fine from Mozilla, but not from konqueror ... what exactly

Deleted: SQLObject/branches/0.10/docs/SQLObject.comments.txt
===================================================================
--- SQLObject/branches/0.10/docs/SQLObject.comments.txt	2009-07-25 11:05:09 UTC (rev 3927)
+++ SQLObject/branches/0.10/docs/SQLObject.comments.txt	2009-07-25 11:09:01 UTC (rev 3928)
@@ -1,63 +0,0 @@
-==== $(left-join-and-other-joins)  c ++
-----------------------------------------
-date: 2005-12-07T08:36:44
-email: mk...@em...
-id: 3
-ip: 208.255.226.178
-username: Mike Kent
-
-It's probably just me, but I'm finding this part quite confusing.  You'd use a left join to join two tables together, but this example refers to THREE tables, MyTable, Table1, and Table2.  I haven't been able to grasp what's going on.
-==== $(one-to-many-relationships)  c ++++
-----------------------------------------
-date: 2005-12-07T08:46:22
-email: mk...@em...
-id: 4
-ip: 208.255.226.178
-username: Mike Kent
-
-If I have this correctly: For a one-to-many relationship, you use 'ForeignKey' on the 'has one' side, and you use 'MultipleJoin' on the 'has many' side.  I found this to be incredibly non-intuitive and confusing.  How about 'hasOneOf' and 'hasManyOf'?  Or would this cause a problem with a many-to-many relationship, since both sides would use 'hasManyOf'?
-==== $(col-class-specifying-columns)  c ++ c +++++ c
-----------------------------------------
-date: 2005-12-07T08:52:14
-email: mk...@em...
-id: 5
-ip: 208.255.226.178
-username: Mike Kent
-
-So if you declare a column as an alternateID, unique is implied, and we don't need to explicitly declare it?shouldn't this be protected???
-==== $(orderby) +
-----------------------------------------
-date: 2005-12-08T10:47:35
-email: ch...@wo...
-id: 9
-ip: 134.84.144.61
-username: Chad Walstrom
-
-Text turned grey here.  This renders the text in the following Note unreadable unless you mouse-over.
-==== $(selecting-multiple-objects)
-----------------------------------------
-date: 2006-01-04T14:47:33
-email: jw...@jw...
-id: 10
-ip: 128.197.24.59
-username: Joe
-
-Think about breaking these SELECT statements onto several lines.  They're busting out of the page design now.
-==== $(col-class-specifying-columns)  c ++ c +++++ c +
-----------------------------------------
-date: 2006-02-02T15:43:28
-email: Man
-id: 11
-ip: 192.100.104.28
-username: Big
-
-StringCol's that are alternateID's must have a length property if you use them in MySQL.
-==== $(relatedjoin-many-to-many)  c ++++
-----------------------------------------
-date: 2006-05-18T14:17:19
-email: we...@or...
-id: 12
-ip: 209.204.147.64
-username: Jonathan Wellons
-
-What is the advantage over traditional relations?

Deleted: SQLObject/branches/0.10/docs/index.comments.txt
===================================================================
--- SQLObject/branches/0.10/docs/index.comments.txt	2009-07-25 11:05:09 UTC (rev 3927)
+++ SQLObject/branches/0.10/docs/index.comments.txt	2009-07-25 11:09:01 UTC (rev 3928)
@@ -1,16 +0,0 @@
-==== $(example)  c
-----------------------------------------
-date: 2006-01-31T06:42:16
-id: 2
-ip: 84.190.227.75
-username: MB
-
-Sie werden jeweils nach Doppelklick gespeichert.
-==== $(example)  c +
-----------------------------------------
-date: 2006-01-31T06:42:36
-id: 3
-ip: 84.190.227.75
-username: MB
-
-Auch an unterschiedlichen Stellen geht das

Modified: SQLObject/branches/0.10/docs/rebuild
===================================================================
--- SQLObject/branches/0.10/docs/rebuild	2009-07-25 11:05:09 UTC (rev 3927)
+++ SQLObject/branches/0.10/docs/rebuild	2009-07-25 11:09:01 UTC (rev 3928)
@@ -7,8 +7,7 @@
 
 NORMAL="Authors DeveloperGuide FAQ Inheritance News
         SQLBuilder SQLObject SelectResults TODO Versioning Views
-        web/index web/links web/repository web/community
-        index community sqlobject-architecture sqlobject-admin"
+        community download index links sqlobject-admin sqlobject-architecture"
 
 for NAME in $NORMAL ; do
     if [ -e "$NAME.html" -a ! "$NAME.html" -ot "$NAME.txt" ] ; then
@@ -19,5 +18,3 @@
     rst2html.py --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
         -- "$NAME.txt" > "$NAME.html"
 done
-
-exec source-highlight -f html interface.py

Deleted: SQLObject/branches/0.10/docs/sqlobject-admin.comments.txt
===================================================================

[SQL-CVS] r3927 - SQLObject/branches/0.9/docs

[<sub...@co...>]

Author: phd
Date: 2009-07-25 05:05:09 -0600 (Sat, 25 Jul 2009)
New Revision: 3927

Removed:
   SQLObject/branches/0.9/docs/SQLObject.comments.txt
Modified:
   SQLObject/branches/0.9/docs/rebuild
Log:
Removed SQLObject.comments.txt.


Deleted: SQLObject/branches/0.9/docs/SQLObject.comments.txt
===================================================================
--- SQLObject/branches/0.9/docs/SQLObject.comments.txt	2009-07-25 11:01:07 UTC (rev 3926)
+++ SQLObject/branches/0.9/docs/SQLObject.comments.txt	2009-07-25 11:05:09 UTC (rev 3927)
@@ -1,63 +0,0 @@
-==== $(left-join-and-other-joins)  c ++
-----------------------------------------
-date: 2005-12-07T08:36:44
-email: mk...@em...
-id: 3
-ip: 208.255.226.178
-username: Mike Kent
-
-It's probably just me, but I'm finding this part quite confusing.  You'd use a left join to join two tables together, but this example refers to THREE tables, MyTable, Table1, and Table2.  I haven't been able to grasp what's going on.
-==== $(one-to-many-relationships)  c ++++
-----------------------------------------
-date: 2005-12-07T08:46:22
-email: mk...@em...
-id: 4
-ip: 208.255.226.178
-username: Mike Kent
-
-If I have this correctly: For a one-to-many relationship, you use 'ForeignKey' on the 'has one' side, and you use 'MultipleJoin' on the 'has many' side.  I found this to be incredibly non-intuitive and confusing.  How about 'hasOneOf' and 'hasManyOf'?  Or would this cause a problem with a many-to-many relationship, since both sides would use 'hasManyOf'?
-==== $(col-class-specifying-columns)  c ++ c +++++ c
-----------------------------------------
-date: 2005-12-07T08:52:14
-email: mk...@em...
-id: 5
-ip: 208.255.226.178
-username: Mike Kent
-
-So if you declare a column as an alternateID, unique is implied, and we don't need to explicitly declare it?shouldn't this be protected???
-==== $(orderby) +
-----------------------------------------
-date: 2005-12-08T10:47:35
-email: ch...@wo...
-id: 9
-ip: 134.84.144.61
-username: Chad Walstrom
-
-Text turned grey here.  This renders the text in the following Note unreadable unless you mouse-over.
-==== $(selecting-multiple-objects)
-----------------------------------------
-date: 2006-01-04T14:47:33
-email: jw...@jw...
-id: 10
-ip: 128.197.24.59
-username: Joe
-
-Think about breaking these SELECT statements onto several lines.  They're busting out of the page design now.
-==== $(col-class-specifying-columns)  c ++ c +++++ c +
-----------------------------------------
-date: 2006-02-02T15:43:28
-email: Man
-id: 11
-ip: 192.100.104.28
-username: Big
-
-StringCol's that are alternateID's must have a length property if you use them in MySQL.
-==== $(relatedjoin-many-to-many)  c ++++
-----------------------------------------
-date: 2006-05-18T14:17:19
-email: we...@or...
-id: 12
-ip: 209.204.147.64
-username: Jonathan Wellons
-
-What is the advantage over traditional relations?

Modified: SQLObject/branches/0.9/docs/rebuild
===================================================================
--- SQLObject/branches/0.9/docs/rebuild	2009-07-25 11:01:07 UTC (rev 3926)
+++ SQLObject/branches/0.9/docs/rebuild	2009-07-25 11:05:09 UTC (rev 3927)
@@ -6,8 +6,8 @@
 export PYTHONPATH=$parent:$PYTHONPATH
 
 NORMAL="Authors DeveloperGuide FAQ Inheritance News
-        SQLBuilder SQLObject SQLObject.comments TODO Versioning
-        community download index links sqlobject-admin sqlobject-architecture"
+        SQLBuilder SQLObject TODO Versioning community download index
+        links sqlobject-admin sqlobject-architecture"
 
 for NAME in $NORMAL ; do
     if [ -e "$NAME.html" -a ! "$NAME.html" -ot "$NAME.txt" ] ; then