sqlobject-cvs — CVS notification

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

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

Author: phd
Date: 2010-04-20 11:55:12 -0600 (Tue, 20 Apr 2010)
New Revision: 4184

Modified:
   SQLObject/trunk/docs/News.txt
Log:
Merged revision 4182 from branch 0.11: better wording.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-20 17:54:40 UTC (rev 4183)
+++ SQLObject/trunk/docs/News.txt	2010-04-20 17:55:12 UTC (rev 4184)
@@ -124,7 +124,7 @@
 ================
 
 * A bug was fixed in SQLiteConnection.columnsFromSchema(): pass None as
-  size/precision, this is better than no value at all.
+  size/precision to DecimalCol, this is better than no value at all.
 
 SQLObject 0.11.5
 ================

[SQL-CVS] r4183 - SQLObject/branches/0.12/docs

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

Author: phd
Date: 2010-04-20 11:54:40 -0600 (Tue, 20 Apr 2010)
New Revision: 4183

Modified:
   SQLObject/branches/0.12/docs/News.txt
Log:
Merged revision 4182 from branch 0.11: better wording.


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-04-20 17:53:21 UTC (rev 4182)
+++ SQLObject/branches/0.12/docs/News.txt	2010-04-20 17:54:40 UTC (rev 4183)
@@ -91,7 +91,7 @@
 ================
 
 * A bug was fixed in SQLiteConnection.columnsFromSchema(): pass None as
-  size/precision, this is better than no value at all.
+  size/precision to DecimalCol, this is better than no value at all.
 
 SQLObject 0.11.5
 ================

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

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

Author: phd
Date: 2010-04-20 11:53:21 -0600 (Tue, 20 Apr 2010)
New Revision: 4182

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


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-04-20 17:52:23 UTC (rev 4181)
+++ SQLObject/branches/0.11/docs/News.txt	2010-04-20 17:53:21 UTC (rev 4182)
@@ -11,7 +11,7 @@
 ================
 
 * A bug was fixed in SQLiteConnection.columnsFromSchema(): pass None as
-  size/precision, this is better than no value at all.
+  size/precision to DecimalCol, this is better than no value at all.
 
 SQLObject 0.11.5
 ================

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

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

Author: phd
Date: 2010-04-20 11:52:23 -0600 (Tue, 20 Apr 2010)
New Revision: 4181

Modified:
   SQLObject/trunk/sqlobject/col.py
Log:
Method StringValidator.from_python was merged with to_python.


Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2010-04-20 17:49:49 UTC (rev 4180)
+++ SQLObject/trunk/sqlobject/col.py	2010-04-20 17:52:23 UTC (rev 4181)
@@ -523,19 +523,7 @@
         raise validators.Invalid("expected a str in the StringCol '%s', got %s %r instead" % \
             (self.name, type(value), value), value, state)
 
-    def from_python(self, value, state):
-        if value is None:
-            return None
-        if isinstance(value, unicode):
-            connection = state.soObject._connection
-            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
-            return value.encode(dbEncoding)
-        if self.dataType and isinstance(value, self.dataType):
-            return value
-        if isinstance(value, (str, buffer, sqlbuilder.SQLExpression)):
-            return value
-        raise validators.Invalid("expected a str in the StringCol '%s', got %s %r instead" % \
-            (self.name, type(value), value), value, state)
+    from_python = to_python
 
 class SOStringCol(SOStringLikeCol):
 

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

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

Author: phd
Date: 2010-04-20 11:49:49 -0600 (Tue, 20 Apr 2010)
New Revision: 4180

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/dbconnection.py
   SQLObject/trunk/sqlobject/main.py
Log:
Merged revisions 4178, 4179 from branch 0.12: bugs were fixed in calling from_python().


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-20 17:40:16 UTC (rev 4179)
+++ SQLObject/trunk/docs/News.txt	2010-04-20 17:49:49 UTC (rev 4180)
@@ -43,8 +43,10 @@
 SQLObject 0.12.4
 ================
 
-* A bugfix ported from `SQLObject 0.11.6`_.
+* Bugs were fixed in calling from_python().
 
+* A bugfix was ported from `SQLObject 0.11.6`_.
+
 SQLObject 0.12.3
 ================
 

Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	2010-04-20 17:40:16 UTC (rev 4179)
+++ SQLObject/trunk/sqlobject/dbconnection.py	2010-04-20 17:49:49 UTC (rev 4180)
@@ -582,7 +582,7 @@
             if key in kw:
                 value = kw.pop(key)
                 if col.from_python:
-                    value = col.from_python(value, soClass)
+                    value = col.from_python(value, sqlbuilder.SQLObjectState(soClass))
                 data[col.dbName] = value
             elif col.foreignName in kw:
                 obj = kw.pop(col.foreignName)

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2010-04-20 17:40:16 UTC (rev 4179)
+++ SQLObject/trunk/sqlobject/main.py	2010-04-20 17:49:49 UTC (rev 4180)
@@ -1318,7 +1318,7 @@
         for n, v in zip(name, value):
             from_python = getattr(cls, '_SO_from_python_' + n)
             if from_python:
-                v = from_python(v, cls)
+                v = from_python(v, sqlbuilder.SQLObjectState(cls))
             new_value.append(v)
         condition = sqlbuilder.AND(*[getattr(cls.q, n)==v for n,v in zip(name, new_value)])
         return (connection or cls._connection)._SO_selectOneAlt(

[SQL-CVS] r4179 - in SQLObject/branches/0.12: docs sqlobject

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

Author: phd
Date: 2010-04-20 11:40:16 -0600 (Tue, 20 Apr 2010)
New Revision: 4179

Modified:
   SQLObject/branches/0.12/docs/News.txt
   SQLObject/branches/0.12/sqlobject/main.py
Log:
Bugs were fixed in calling from_python().


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-04-20 17:25:19 UTC (rev 4178)
+++ SQLObject/branches/0.12/docs/News.txt	2010-04-20 17:40:16 UTC (rev 4179)
@@ -10,7 +10,7 @@
 SQLObject 0.12.4
 ================
 
-* A bug was fixed in calling from_python().
+* Bugs were fixed in calling from_python().
 
 * A bugfix was ported from `SQLObject 0.11.6`_.
 

Modified: SQLObject/branches/0.12/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/main.py	2010-04-20 17:25:19 UTC (rev 4178)
+++ SQLObject/branches/0.12/sqlobject/main.py	2010-04-20 17:40:16 UTC (rev 4179)
@@ -1317,7 +1317,7 @@
         for n, v in zip(name, value):
             from_python = getattr(cls, '_SO_from_python_' + n)
             if from_python:
-                v = from_python(v, cls)
+                v = from_python(v, sqlbuilder.SQLObjectState(cls))
             new_value.append(v)
         condition = sqlbuilder.AND(*[getattr(cls.q, n)==v for n,v in zip(name, new_value)])
         return (connection or cls._connection)._SO_selectOneAlt(

[SQL-CVS] r4178 - in SQLObject/branches/0.12: docs sqlobject

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

Author: phd
Date: 2010-04-20 11:25:19 -0600 (Tue, 20 Apr 2010)
New Revision: 4178

Modified:
   SQLObject/branches/0.12/docs/News.txt
   SQLObject/branches/0.12/sqlobject/dbconnection.py
Log:
A bug was fixed in calling from_python().


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-04-20 16:42:17 UTC (rev 4177)
+++ SQLObject/branches/0.12/docs/News.txt	2010-04-20 17:25:19 UTC (rev 4178)
@@ -10,8 +10,10 @@
 SQLObject 0.12.4
 ================
 
-* A bugfix ported from `SQLObject 0.11.6`_.
+* A bug was fixed in calling from_python().
 
+* A bugfix was ported from `SQLObject 0.11.6`_.
+
 SQLObject 0.12.3
 ================
 

Modified: SQLObject/branches/0.12/sqlobject/dbconnection.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/dbconnection.py	2010-04-20 16:42:17 UTC (rev 4177)
+++ SQLObject/branches/0.12/sqlobject/dbconnection.py	2010-04-20 17:25:19 UTC (rev 4178)
@@ -582,7 +582,7 @@
             if key in kw:
                 value = kw.pop(key)
                 if col.from_python:
-                    value = col.from_python(value, soClass)
+                    value = col.from_python(value, sqlbuilder.SQLObjectState(soClass))
                 data[col.dbName] = value
             elif col.foreignName in kw:
                 obj = kw.pop(col.foreignName)

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

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

Author: phd
Date: 2010-04-20 10:42:17 -0600 (Tue, 20 Apr 2010)
New Revision: 4177

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Log:
Merged revision 4176 from branch 0.12: a bugfix ported from SQLObject 0.11.6.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-20 16:40:17 UTC (rev 4176)
+++ SQLObject/trunk/docs/News.txt	2010-04-20 16:42:17 UTC (rev 4177)
@@ -40,6 +40,11 @@
 
 * Renamed db_encoding to dbEncoding in UnicodeStringValidator.
 
+SQLObject 0.12.4
+================
+
+* A bugfix ported from `SQLObject 0.11.6`_.
+
 SQLObject 0.12.3
 ================
 
@@ -113,6 +118,12 @@
 
 * Removed the last remained string exceptions.
 
+SQLObject 0.11.6
+================
+
+* A bug was fixed in SQLiteConnection.columnsFromSchema(): pass None as
+  size/precision, this is better than no value at all.
+
 SQLObject 0.11.5
 ================
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2010-04-20 16:40:17 UTC (rev 4176)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2010-04-20 16:42:17 UTC (rev 4177)
@@ -365,7 +365,7 @@
         elif t.find('REAL') >= 0 or t.find('FLOAT') >= 0:
             return col.FloatCol, {}
         elif t.find('DECIMAL') >= 0:
-            return col.DecimalCol, {}
+            return col.DecimalCol, {'size': None, 'precision': None}
         elif t.find('BOOL') >= 0:
             return col.BoolCol, {}
         else:

[SQL-CVS] r4176 - in SQLObject/branches/0.12: docs sqlobject/sqlite

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

Author: phd
Date: 2010-04-20 10:40:17 -0600 (Tue, 20 Apr 2010)
New Revision: 4176

Modified:
   SQLObject/branches/0.12/docs/News.txt
   SQLObject/branches/0.12/sqlobject/sqlite/sqliteconnection.py
Log:
Merged revision 4175 from branch 0.11: a bugfix ported from SQLObject 0.11.6.


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-04-20 16:38:13 UTC (rev 4175)
+++ SQLObject/branches/0.12/docs/News.txt	2010-04-20 16:40:17 UTC (rev 4176)
@@ -7,6 +7,11 @@
 
 .. _start:
 
+SQLObject 0.12.4
+================
+
+* A bugfix ported from `SQLObject 0.11.6`_.
+
 SQLObject 0.12.3
 ================
 
@@ -80,6 +85,12 @@
 
 * Removed the last remained string exceptions.
 
+SQLObject 0.11.6
+================
+
+* A bug was fixed in SQLiteConnection.columnsFromSchema(): pass None as
+  size/precision, this is better than no value at all.
+
 SQLObject 0.11.5
 ================
 

Modified: SQLObject/branches/0.12/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/sqlite/sqliteconnection.py	2010-04-20 16:38:13 UTC (rev 4175)
+++ SQLObject/branches/0.12/sqlobject/sqlite/sqliteconnection.py	2010-04-20 16:40:17 UTC (rev 4176)
@@ -365,7 +365,7 @@
         elif t.find('REAL') >= 0 or t.find('FLOAT') >= 0:
             return col.FloatCol, {}
         elif t.find('DECIMAL') >= 0:
-            return col.DecimalCol, {}
+            return col.DecimalCol, {'size': None, 'precision': None}
         elif t.find('BOOL') >= 0:
             return col.BoolCol, {}
         else:

[SQL-CVS] r4175 - in SQLObject/branches/0.11: docs sqlobject/sqlite

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

Author: phd
Date: 2010-04-20 10:38:13 -0600 (Tue, 20 Apr 2010)
New Revision: 4175

Modified:
   SQLObject/branches/0.11/docs/News.txt
   SQLObject/branches/0.11/sqlobject/sqlite/sqliteconnection.py
Log:
A bug was fixed in SQLiteConnection.columnsFromSchema(): pass None as size/precision,
this is better than no value at all.


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-04-17 01:35:37 UTC (rev 4174)
+++ SQLObject/branches/0.11/docs/News.txt	2010-04-20 16:38:13 UTC (rev 4175)
@@ -7,6 +7,12 @@
 
 .. _start:
 
+SQLObject 0.11.6
+================
+
+* A bug was fixed in SQLiteConnection.columnsFromSchema(): pass None as
+  size/precision, this is better than no value at all.
+
 SQLObject 0.11.5
 ================
 

Modified: SQLObject/branches/0.11/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/sqlite/sqliteconnection.py	2010-04-17 01:35:37 UTC (rev 4174)
+++ SQLObject/branches/0.11/sqlobject/sqlite/sqliteconnection.py	2010-04-20 16:38:13 UTC (rev 4175)
@@ -362,7 +362,7 @@
         elif t.find('REAL') >= 0 or t.find('FLOAT') >= 0:
             return col.FloatCol, {}
         elif t.find('DECIMAL') >= 0:
-            return col.DecimalCol, {}
+            return col.DecimalCol, {'size': None, 'precision': None}
         elif t.find('BOOL') >= 0:
             return col.BoolCol, {}
         else:

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

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

Author: phd
Date: 2010-04-15 12:57:12 -0600 (Thu, 15 Apr 2010)
New Revision: 4173

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/col.py
Log:
Validators became stricter: IntCol accepts int, long or an instance of a class
that implements __int__ or __long__; FloatCol accepts float, int, long or an
instance of a class that implements __float__, __int__ or __long__.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-11 16:52:57 UTC (rev 4172)
+++ SQLObject/trunk/docs/News.txt	2010-04-15 18:57:12 UTC (rev 4173)
@@ -16,8 +16,11 @@
 * SQLObject instances that don't have a per-instance connection can be
   pickled and unpickled.
 
-* Added TimedeltaCol; currently it's only implemented on PostgreSQL as an
-  INTERVAL type.
+* Validators became stricter: StringCol and UnicodeCol now accept only str
+  or unicode; BoolCol accepts only bool or int; IntCol accepts int, long or
+  an instance of a class that implements __int__ or __long__; FloatCol
+  accepts float, int, long or an instance of a class that implements
+  __float__, __int__ or __long__.
 
 * Added a connection class for rdbhost.com (commercial Postgres-over-Web
   service).
@@ -25,13 +28,13 @@
 Small Features
 --------------
 
+* Added TimedeltaCol; currently it's only implemented on PostgreSQL as an
+  INTERVAL type.
+
 * Do not pollute the base sqlmeta class to allow Style to set idName. In
   the case of inherited idName inherited value takes precedence; to allow
   Style to set idName reset inherited idName to None.
 
-* Validators became stricter: StringCol and UnicodeCol now accept only str
-  or unicode, BoolCol accepts only bool or int, and so on.
-
 * Better handling of circular dependencies in sqlobject-admin -
   do not include the class in the list of other classes.
 

Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2010-04-11 16:52:57 UTC (rev 4172)
+++ SQLObject/trunk/sqlobject/col.py	2010-04-15 18:57:12 UTC (rev 4173)
@@ -591,19 +591,16 @@
             return None
         if isinstance(value, (int, long, sqlbuilder.SQLExpression)):
             return value
-        try:
-            return int(value)
-        except:
-            raise validators.Invalid("expected an int in the IntCol '%s', got %s %r instead" % \
+        for converter, attr_name in (int, '__int__'), (long, '__long__'):
+            if hasattr(value, attr_name):
+                try:
+                    return converter(value)
+                except:
+                    break
+        raise validators.Invalid("expected an int in the IntCol '%s', got %s %r instead" % \
                 (self.name, type(value), value), value, state)
 
-    def from_python(self, value, state):
-        if value is None:
-            return None
-        if isinstance(value, (int, long, sqlbuilder.SQLExpression)):
-            return value
-        raise validators.Invalid("expected an int in the IntCol '%s', got %s %r instead" % \
-            (self.name, type(value), value), value, state)
+    from_python = to_python
 
 class SOIntCol(SOCol):
     # 3-03 @@: support precision, maybe max and min directly
@@ -720,8 +717,14 @@
     def to_python(self, value, state):
         if value is None:
             return None
-        if isinstance(value, (int, long, float, sqlbuilder.SQLExpression)):
+        if isinstance(value, (float, int, long, sqlbuilder.SQLExpression)):
             return value
+        for converter, attr_name in  (float, '__float__'), (int, '__int__'), (long, '__long__'):
+            if hasattr(value, attr_name):
+                try:
+                    return converter(value)
+                except:
+                    break
         raise validators.Invalid("expected a float in the FloatCol '%s', got %s %r instead" % \
             (self.name, type(value), value), value, state)
 

[SQL-CVS] r4172 - in SQLObject/tags/0.12.3: . sqlobject

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

Author: phd
Date: 2010-04-11 10:52:57 -0600 (Sun, 11 Apr 2010)
New Revision: 4172

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


Modified: SQLObject/tags/0.12.3/setup.cfg
===================================================================
--- SQLObject/tags/0.12.3/setup.cfg	2010-04-11 16:51:23 UTC (rev 4171)
+++ SQLObject/tags/0.12.3/setup.cfg	2010-04-11 16:52:57 UTC (rev 4172)
@@ -2,13 +2,6 @@
 command_packages = buildutils.pudge_command,
                    buildutils.publish_command
 
-[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.12.3/setup.py
===================================================================
--- SQLObject/tags/0.12.3/setup.py	2010-04-11 16:51:23 UTC (rev 4171)
+++ SQLObject/tags/0.12.3/setup.py	2010-04-11 16:52:57 UTC (rev 4172)
@@ -21,7 +21,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.12",
+      version="0.12.3",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an
@@ -49,7 +49,7 @@
       author="Ian Bicking",
       author_email="ia...@co...",
       url="http://sqlobject.org/",
-      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.12",
+      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.12.3",
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin"],

Modified: SQLObject/tags/0.12.3/sqlobject/__init__.py
===================================================================
--- SQLObject/tags/0.12.3/sqlobject/__init__.py	2010-04-11 16:51:23 UTC (rev 4171)
+++ SQLObject/tags/0.12.3/sqlobject/__init__.py	2010-04-11 16:52:57 UTC (rev 4172)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.12
+SQLObject 0.12.3
 """
 
 from col import *

Modified: SQLObject/tags/0.12.3/sqlobject/main.py
===================================================================
--- SQLObject/tags/0.12.3/sqlobject/main.py	2010-04-11 16:51:23 UTC (rev 4171)
+++ SQLObject/tags/0.12.3/sqlobject/main.py	2010-04-11 16:52:57 UTC (rev 4172)
@@ -1,6 +1,6 @@
 """
-SQLObject 0.12
---------------
+SQLObject 0.12.3
+----------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r4171 - SQLObject/tags

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

Author: phd
Date: 2010-04-11 10:51:23 -0600 (Sun, 11 Apr 2010)
New Revision: 4171

Added:
   SQLObject/tags/0.12.3/
Log:
Tagging 0.12.3

Copied: SQLObject/tags/0.12.3 (from rev 4170, SQLObject/branches/0.12)

[SQL-CVS] r4170 - in SQLObject/tags/0.11.5: . sqlobject

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

Author: phd
Date: 2010-04-11 10:48:39 -0600 (Sun, 11 Apr 2010)
New Revision: 4170

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


Modified: SQLObject/tags/0.11.5/setup.cfg
===================================================================
--- SQLObject/tags/0.11.5/setup.cfg	2010-04-11 16:46:35 UTC (rev 4169)
+++ SQLObject/tags/0.11.5/setup.cfg	2010-04-11 16:48:39 UTC (rev 4170)
@@ -2,13 +2,6 @@
 command_packages = buildutils.pudge_command,
                    buildutils.publish_command
 
-[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.5/setup.py
===================================================================
--- SQLObject/tags/0.11.5/setup.py	2010-04-11 16:46:35 UTC (rev 4169)
+++ SQLObject/tags/0.11.5/setup.py	2010-04-11 16:48:39 UTC (rev 4170)
@@ -21,7 +21,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.11",
+      version="0.11.5",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an
@@ -49,7 +49,7 @@
       author="Ian Bicking",
       author_email="ia...@co...",
       url="http://sqlobject.org/",
-      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.11",
+      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.11.5",
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin"],

Modified: SQLObject/tags/0.11.5/sqlobject/__init__.py
===================================================================
--- SQLObject/tags/0.11.5/sqlobject/__init__.py	2010-04-11 16:46:35 UTC (rev 4169)
+++ SQLObject/tags/0.11.5/sqlobject/__init__.py	2010-04-11 16:48:39 UTC (rev 4170)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.11
+SQLObject 0.11.5
 """
 
 from main import *

Modified: SQLObject/tags/0.11.5/sqlobject/main.py
===================================================================
--- SQLObject/tags/0.11.5/sqlobject/main.py	2010-04-11 16:46:35 UTC (rev 4169)
+++ SQLObject/tags/0.11.5/sqlobject/main.py	2010-04-11 16:48:39 UTC (rev 4170)
@@ -1,6 +1,6 @@
 """
-SQLObject 0.11
---------------
+SQLObject 0.11.5
+----------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r4169 - SQLObject/tags

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

Author: phd
Date: 2010-04-11 10:46:35 -0600 (Sun, 11 Apr 2010)
New Revision: 4169

Added:
   SQLObject/tags/0.11.5/
Log:
Tagging 0.11.5

Copied: SQLObject/tags/0.11.5 (from rev 4168, SQLObject/branches/0.11)

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

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

Author: phd
Date: 2010-04-11 10:44:41 -0600 (Sun, 11 Apr 2010)
New Revision: 4168

Modified:
   SQLObject/trunk/docs/News.txt
Log:
SQLObject 0.12.3 and 0.11.5 was released 11 Apr 2010.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-11 16:42:36 UTC (rev 4167)
+++ SQLObject/trunk/docs/News.txt	2010-04-11 16:44:41 UTC (rev 4168)
@@ -40,8 +40,10 @@
 SQLObject 0.12.3
 ================
 
-* Bugfixes ported from `SQLObject 0.11.5`_.
+Released 11 Apr 2010.
 
+* A bugfix ported from `SQLObject 0.11.5`_.
+
 SQLObject 0.12.2
 ================
 
@@ -111,6 +113,8 @@
 SQLObject 0.11.5
 ================
 
+Released 11 Apr 2010.
+
 * Fixed a bug in replacing _connection in a case when no previous
   _connection has been set.
 

[SQL-CVS] r4167 - SQLObject/branches/0.12/docs

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

Author: phd
Date: 2010-04-11 10:42:36 -0600 (Sun, 11 Apr 2010)
New Revision: 4167

Modified:
   SQLObject/branches/0.12/docs/News.txt
Log:
SQLObject 0.12.3 and 0.11.5 was released 11 Apr 2010.


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-04-11 16:40:50 UTC (rev 4166)
+++ SQLObject/branches/0.12/docs/News.txt	2010-04-11 16:42:36 UTC (rev 4167)
@@ -10,8 +10,10 @@
 SQLObject 0.12.3
 ================
 
-* Bugfixes ported from `SQLObject 0.11.5`_.
+Released 11 Apr 2010.
 
+* A bugfix ported from `SQLObject 0.11.5`_.
+
 SQLObject 0.12.2
 ================
 
@@ -81,6 +83,8 @@
 SQLObject 0.11.5
 ================
 
+Released 11 Apr 2010.
+
 * Fixed a bug in replacing _connection in a case when no previous
   _connection has been set.
 

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

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

Author: phd
Date: 2010-04-11 10:40:50 -0600 (Sun, 11 Apr 2010)
New Revision: 4166

Modified:
   SQLObject/branches/0.11/docs/News.txt
Log:
SQLObject 0.11.5 was released 11 Apr 2010.


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-04-10 20:44:57 UTC (rev 4165)
+++ SQLObject/branches/0.11/docs/News.txt	2010-04-11 16:40:50 UTC (rev 4166)
@@ -10,6 +10,8 @@
 SQLObject 0.11.5
 ================
 
+Released 11 Apr 2010.
+
 * Fixed a bug in replacing _connection in a case when no previous
   _connection has been set.
 

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

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

Author: phd
Date: 2010-04-10 14:44:57 -0600 (Sat, 10 Apr 2010)
New Revision: 4165

Modified:
   SQLObject/trunk/docs/News.txt
Log:
Merged revision 4164 from branch 0.12: changed wording.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-10 20:44:18 UTC (rev 4164)
+++ SQLObject/trunk/docs/News.txt	2010-04-10 20:44:57 UTC (rev 4165)
@@ -111,8 +111,8 @@
 SQLObject 0.11.5
 ================
 
-* Fixed a bug in replacing self._connection in the case no previous
-  self._connection has been set.
+* Fixed a bug in replacing _connection in a case when no previous
+  _connection has been set.
 
 SQLObject 0.11.4
 ================

[SQL-CVS] r4164 - SQLObject/branches/0.12/docs

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

Author: phd
Date: 2010-04-10 14:44:18 -0600 (Sat, 10 Apr 2010)
New Revision: 4164

Modified:
   SQLObject/branches/0.12/docs/News.txt
Log:
Merged revision 4163 from branch 0.11: changed wording.


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-04-10 20:43:01 UTC (rev 4163)
+++ SQLObject/branches/0.12/docs/News.txt	2010-04-10 20:44:18 UTC (rev 4164)
@@ -81,8 +81,8 @@
 SQLObject 0.11.5
 ================
 
-* Fixed a bug in replacing self._connection in the case no previous
-  self._connection has been set.
+* Fixed a bug in replacing _connection in a case when no previous
+  _connection has been set.
 
 SQLObject 0.11.4
 ================

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

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

Author: phd
Date: 2010-04-10 14:43:01 -0600 (Sat, 10 Apr 2010)
New Revision: 4163

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


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-04-09 20:37:52 UTC (rev 4162)
+++ SQLObject/branches/0.11/docs/News.txt	2010-04-10 20:43:01 UTC (rev 4163)
@@ -10,8 +10,8 @@
 SQLObject 0.11.5
 ================
 
-* Fixed a bug in replacing self._connection in the case no previous
-  self._connection has been set.
+* Fixed a bug in replacing _connection in a case when no previous
+  _connection has been set.
 
 SQLObject 0.11.4
 ================

[SQL-CVS] r4162 - SQLObject/trunk

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

Author: phd
Date: 2010-04-09 14:37:52 -0600 (Fri, 09 Apr 2010)
New Revision: 4162

Modified:
   SQLObject/trunk/README.txt
   SQLObject/trunk/setup.py
Log:
Added rdbhost to the list of subpackages.


Modified: SQLObject/trunk/README.txt
===================================================================
--- SQLObject/trunk/README.txt	2010-04-09 18:14:03 UTC (rev 4161)
+++ SQLObject/trunk/README.txt	2010-04-09 20:37:52 UTC (rev 4162)
@@ -7,7 +7,7 @@
 
 It currently supports MySQL through the `MySQLdb` package, PostgreSQL
 through the `psycopg` package, SQLite, Firebird, MaxDB (SAP DB), MS SQL
-and Sybase.  It should support Python versions back to 2.4.
+Sybase and Rdbhost.  It should support Python versions back to 2.4.
 
 For more information please see the documentation in
 docs/SQLObject.txt, or online at http://sqlobject.org/

Modified: SQLObject/trunk/setup.py
===================================================================
--- SQLObject/trunk/setup.py	2010-04-09 18:14:03 UTC (rev 4161)
+++ SQLObject/trunk/setup.py	2010-04-09 20:37:52 UTC (rev 4162)
@@ -10,8 +10,8 @@
     is_setuptools = False
 
 subpackages = ['firebird', 'include', 'include.pydispatch', 'inheritance',
-               'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'sqlite',
-               'sybase', 'util', 'versioning']
+               'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost',
+               'sqlite', 'sybase', 'util', 'versioning']
 
 kw = {}
 if is_setuptools:

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

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

Author: phd
Date: 2010-04-09 12:14:03 -0600 (Fri, 09 Apr 2010)
New Revision: 4161

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
Log:
Fixed a bug in replacing self._connection in the case no previous self._connection has been set.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-09 18:12:47 UTC (rev 4160)
+++ SQLObject/trunk/docs/News.txt	2010-04-09 18:14:03 UTC (rev 4161)
@@ -37,6 +37,11 @@
 
 * Renamed db_encoding to dbEncoding in UnicodeStringValidator.
 
+SQLObject 0.12.3
+================
+
+* Bugfixes ported from `SQLObject 0.11.5`_.
+
 SQLObject 0.12.2
 ================
 
@@ -103,6 +108,12 @@
 
 * Removed the last remained string exceptions.
 
+SQLObject 0.11.5
+================
+
+* Fixed a bug in replacing self._connection in the case no previous
+  self._connection has been set.
+
 SQLObject 0.11.4
 ================
 

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2010-04-09 18:12:47 UTC (rev 4160)
+++ SQLObject/trunk/sqlobject/main.py	2010-04-09 18:14:03 UTC (rev 4161)
@@ -921,7 +921,8 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if (connection is not None) and (self._connection is not connection):
+        if (connection is not None) and \
+                (getattr(self, '_connection', None) is not connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1208,7 +1209,7 @@
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
                 connection = kw.pop('connection')
-                if self._connection is not connection:
+                if getattr(self, '_connection', None) is not connection:
                     self._connection = connection
                     self.sqlmeta._perConnection = True
 

[SQL-CVS] r4160 - in SQLObject/branches/0.12: docs sqlobject

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

Author: phd
Date: 2010-04-09 12:12:47 -0600 (Fri, 09 Apr 2010)
New Revision: 4160

Modified:
   SQLObject/branches/0.12/docs/News.txt
   SQLObject/branches/0.12/sqlobject/main.py
Log:
Fixed a bug in replacing self._connection in the case no previous self._connection has been set.


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-04-09 18:10:56 UTC (rev 4159)
+++ SQLObject/branches/0.12/docs/News.txt	2010-04-09 18:12:47 UTC (rev 4160)
@@ -7,6 +7,11 @@
 
 .. _start:
 
+SQLObject 0.12.3
+================
+
+* Bugfixes ported from `SQLObject 0.11.5`_.
+
 SQLObject 0.12.2
 ================
 
@@ -73,6 +78,12 @@
 
 * Removed the last remained string exceptions.
 
+SQLObject 0.11.5
+================
+
+* Fixed a bug in replacing self._connection in the case no previous
+  self._connection has been set.
+
 SQLObject 0.11.4
 ================
 

Modified: SQLObject/branches/0.12/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/main.py	2010-04-09 18:10:56 UTC (rev 4159)
+++ SQLObject/branches/0.12/sqlobject/main.py	2010-04-09 18:12:47 UTC (rev 4160)
@@ -920,7 +920,8 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if (connection is not None) and (self._connection is not connection):
+        if (connection is not None) and \
+                (getattr(self, '_connection', None) is not connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1207,7 +1208,7 @@
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
                 connection = kw.pop('connection')
-                if self._connection is not connection:
+                if getattr(self, '_connection', None) is not connection:
                     self._connection = connection
                     self.sqlmeta._perConnection = True
 

[SQL-CVS] r4159 - in SQLObject/branches/0.11: docs sqlobject

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

Author: phd
Date: 2010-04-09 12:10:56 -0600 (Fri, 09 Apr 2010)
New Revision: 4159

Modified:
   SQLObject/branches/0.11/docs/News.txt
   SQLObject/branches/0.11/sqlobject/main.py
Log:
Fixed a bug in replacing self._connection in the case no previous self._connection has been set.


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-04-09 18:10:07 UTC (rev 4158)
+++ SQLObject/branches/0.11/docs/News.txt	2010-04-09 18:10:56 UTC (rev 4159)
@@ -7,6 +7,12 @@
 
 .. _start:
 
+SQLObject 0.11.5
+================
+
+* Fixed a bug in replacing self._connection in the case no previous
+  self._connection has been set.
+
 SQLObject 0.11.4
 ================
 

Modified: SQLObject/branches/0.11/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/main.py	2010-04-09 18:10:07 UTC (rev 4158)
+++ SQLObject/branches/0.11/sqlobject/main.py	2010-04-09 18:10:56 UTC (rev 4159)
@@ -922,7 +922,8 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if (connection is not None) and (self._connection is not connection):
+        if (connection is not None) and \
+                (getattr(self, '_connection', None) is not connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1209,7 +1210,7 @@
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
                 connection = kw.pop('connection')
-                if self._connection is not connection:
+                if getattr(self, '_connection', None) is not connection:
                     self._connection = connection
                     self.sqlmeta._perConnection = True