sqlobject-cvs — CVS notification

[SQL-CVS] [ sqlobject-Patches-1614267 ] Prevents half-constructed objects from showing up in queries

[SourceForge.net <no...@so...>]

Patches item #1614267, was opened at 2006-12-12 23:55
Message generated for change (Settings changed) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1614267&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
>Status: Closed
>Resolution: Invalid
Priority: 5
Private: No
Submitted By: David Turner (novalis_dt)
>Assigned to: Oleg Broytmann (phd)
Summary: Prevents half-constructed objects from showing up in queries

Initial Comment:
See discussion on mailing list beginning with <a href="http://sourceforge.net/mailarchive/forum.php?thread_id=31213603&forum_id=30269"> this one</a>.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1614267&group_id=74338

[SQL-CVS] r2213 - home/phd/SQLObject/paramstyles/sqlobject/firebird

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

Author: phd
Date: 2007-01-16 07:20:47 -0700 (Tue, 16 Jan 2007)
New Revision: 2213

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
Log:
Merged patches from the revisions 2208:2212 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:19:08 UTC (rev 2212)
+++ home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:20:47 UTC (rev 2213)
@@ -39,8 +39,8 @@
             password = 'masterkey'
         if not auth:
             auth='sysdba'
-        if os.name == 'nt' and path[0] == '/':
-            # strip the leading slash off of db name/alias
+        # check for alias using
+        if (path[0] == '/') and path[-3:].lower() not in ('fdb', 'gdb'):
             path = path[1:]
         path = path.replace('/', os.sep)
         return cls(host, db=path, user=auth, password=password, **args)

[SQL-CVS] [ sqlobject-Patches-1630441 ] revision 2150 firebird connectionFromURI *NIX db alias usage

[SourceForge.net <no...@so...>]

Patches item #1630441, was opened at 2007-01-08 13:39
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
>Status: Closed
>Resolution: Accepted
Priority: 5
Private: No
Submitted By: Mike Vorozhbensky (mgfox)
Assigned to: Oleg Broytmann (phd)
Summary: revision 2150 firebird connectionFromURI *NIX db alias usage

Initial Comment:
when i try to use URI like "firebird://localhost/database" (database - database alias) in linux, i see error:
--- cut ---
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 160, in __iter__
    return iter(list(self.lazyIter()))
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 168, in lazyIter
    return conn.iterSelect(self)
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 373, in iterSelect
    return select.IterationClass(self, self.getConnection(),
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 239, in getConnection
    conn = self.makeConnection()
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/firebird/firebirdconnection.py", line 87, in makeConnection
    charset=self.charset,
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 472, in connect
    return Connection(*args, **keywords_args)
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 610, in __init__
    self._C_con = _k.attach_db(dsn, dpb, dialect)
OperationalError: (-902, 'isc_attach_database: I/O error for file "/database". Error while trying to open file. No such file or directory. ')

--- end cut ---

path fix this problem

----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-01-16 17:20

Message:
Logged In: YES 
user_id=4799
Originator: NO

Applied and committed to all branches (0.7, 0.8, trunk) in the revisions
2209-2212. Thank you!

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-15 08:16

Message:
Logged In: YES 
user_id=1240394
Originator: YES

yes

----------------------------------------------------------------------

Comment By: Oleg Broytmann (phd)
Date: 2007-01-11 17:25

Message:
Logged In: YES 
user_id=4799
Originator: NO

Also I think I can now remove the code

        if os.name == 'nt' and path[0] == '/':
            # strip the leading slash off of db name/alias
            path = path[1:]

?

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-11 10:59

Message:
Logged In: YES 
user_id=1240394
Originator: YES

yes, your variant is better 

----------------------------------------------------------------------

Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 17:36

Message:
Logged In: YES 
user_id=4799
Originator: NO

Can I change

if path[-3:].lower() != 'fdb' and path[-3:].lower() != 'gdb':

to

if path[-3:].lower() not in ('fdb', 'gdb'):

?

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-08 13:49

Message:
Logged In: YES 
user_id=1240394
Originator: YES

bug also present in revision 2175

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

[SQL-CVS] r2212 - in SQLObject/branches/0.7-bugfix: docs sqlobject/firebird

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

Author: phd
Date: 2007-01-16 07:19:08 -0700 (Tue, 16 Jan 2007)
New Revision: 2212

Modified:
   SQLObject/branches/0.7-bugfix/docs/News.txt
   SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py
Log:
The patch 1630441: remove a leading slash in FirebirdConnection.


Modified: SQLObject/branches/0.7-bugfix/docs/News.txt
===================================================================
--- SQLObject/branches/0.7-bugfix/docs/News.txt	2007-01-16 14:18:53 UTC (rev 2211)
+++ SQLObject/branches/0.7-bugfix/docs/News.txt	2007-01-16 14:19:08 UTC (rev 2212)
@@ -24,6 +24,8 @@
 
 * Fixed a missed import in firebirdconnection.py.
 
+* Remove a leading slash in FirebirdConnection.
+
 SQLObject 0.7.2
 ===============
 

Modified: SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:18:53 UTC (rev 2211)
+++ SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:19:08 UTC (rev 2212)
@@ -39,8 +39,8 @@
             password = 'masterkey'
         if not auth:
             auth='sysdba'
-        if os.name == 'nt' and path[0] == '/':
-            # strip the leading slash off of db name/alias
+        # check for alias using
+        if (path[0] == '/') and path[-3:].lower() not in ('fdb', 'gdb'):
             path = path[1:]
         path = path.replace('/', os.sep)
         return cls(host, db=path, user=auth, passwd=password, **args)

[SQL-CVS] r2211 - SQLObject/branches/0.8/sqlobject/firebird

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

Author: phd
Date: 2007-01-16 07:18:53 -0700 (Tue, 16 Jan 2007)
New Revision: 2211

Modified:
   SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py
Log:
The patch 1630441: remove a leading slash in FirebirdConnection.


Modified: SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:18:26 UTC (rev 2210)
+++ SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:18:53 UTC (rev 2211)
@@ -39,8 +39,8 @@
             password = 'masterkey'
         if not auth:
             auth='sysdba'
-        if os.name == 'nt' and path[0] == '/':
-            # strip the leading slash off of db name/alias
+        # check for alias using
+        if (path[0] == '/') and path[-3:].lower() not in ('fdb', 'gdb'):
             path = path[1:]
         path = path.replace('/', os.sep)
         return cls(host, db=path, user=auth, password=password, **args)

[SQL-CVS] r2210 - SQLObject/docs

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

Author: phd
Date: 2007-01-16 07:18:26 -0700 (Tue, 16 Jan 2007)
New Revision: 2210

Modified:
   SQLObject/docs/News.txt
Log:
The patch 1630441: remove a leading slash in FirebirdConnection. Updated news for SQLObject 0.7.3.


Modified: SQLObject/docs/News.txt
===================================================================
--- SQLObject/docs/News.txt	2007-01-16 14:16:52 UTC (rev 2209)
+++ SQLObject/docs/News.txt	2007-01-16 14:18:26 UTC (rev 2210)
@@ -149,6 +149,15 @@
 
 * Psycopg1 requires port to be a string; psycopg2 requires port to be an int.
 
+* Fixed a bug in MSSQLConnection caused by column names being unicode.
+
+* Fixed a bug in FirebirdConnection caused by column names having trailing
+  spaces.
+
+* Fixed a missed import in firebirdconnection.py.
+
+* Remove a leading slash in FirebirdConnection.
+
 SQLObject 0.7.2
 ===============
 

[SQL-CVS] r2209 - SQLObject/trunk/sqlobject/firebird

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

Author: phd
Date: 2007-01-16 07:16:52 -0700 (Tue, 16 Jan 2007)
New Revision: 2209

Modified:
   SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
Log:
The patch 1630441: remove a leading slash in FirebirdConnection.


Modified: SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:07:19 UTC (rev 2208)
+++ SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:16:52 UTC (rev 2209)
@@ -39,8 +39,8 @@
             password = 'masterkey'
         if not auth:
             auth='sysdba'
-        if os.name == 'nt' and path[0] == '/':
-            # strip the leading slash off of db name/alias
+        # check for alias using
+        if (path[0] == '/') and path[-3:].lower() not in ('fdb', 'gdb'):
             path = path[1:]
         path = path.replace('/', os.sep)
         return cls(host, db=path, user=auth, password=password, **args)

[SQL-CVS] r2208 - home/phd/SQLObject/paramstyles/sqlobject/mysql

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

Author: phd
Date: 2007-01-16 07:07:19 -0700 (Tue, 16 Jan 2007)
New Revision: 2208

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
Log:
Merged patches from the revisions 2204:2207 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-01-16 14:05:23 UTC (rev 2207)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-01-16 14:07:19 UTC (rev 2208)
@@ -17,7 +17,7 @@
     dbName = 'mysql'
     schemes = [dbName]
 
-    def __init__(self, db, user, password='', host='localhost', port=None, **kw):
+    def __init__(self, db, user, password='', host='localhost', port=0, **kw):
         global MySQLdb
         if MySQLdb is None:
             import MySQLdb
@@ -35,7 +35,7 @@
         else:
             self.need_unicode = False
         for key in ("unix_socket", "init_command",
-                "read_default_file", "read_default_group"):
+                "read_default_file", "read_default_group", "conv"):
             if key in kw:
                 self.kw[key] = col.popKey(kw, key)
         for key in ("connect_timeout", "compress", "named_pipe", "use_unicode",

[SQL-CVS] r2207 - SQLObject/docs

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

Author: phd
Date: 2007-01-16 07:05:23 -0700 (Tue, 16 Jan 2007)
New Revision: 2207

Modified:
   SQLObject/docs/News.txt
   SQLObject/docs/SQLObject.txt
Log:
MySQLConnection got new keyword "conv" - a list of custom converters.


Modified: SQLObject/docs/News.txt
===================================================================
--- SQLObject/docs/News.txt	2007-01-16 14:00:51 UTC (rev 2206)
+++ SQLObject/docs/News.txt	2007-01-16 14:05:23 UTC (rev 2207)
@@ -34,6 +34,8 @@
 
 .. _Versioning: Versioning.html
 
+* MySQLConnection got new keyword "conv" - a list of custom converters.
+
 Small Features
 --------------
 

Modified: SQLObject/docs/SQLObject.txt
===================================================================
--- SQLObject/docs/SQLObject.txt	2007-01-16 14:00:51 UTC (rev 2206)
+++ SQLObject/docs/SQLObject.txt	2007-01-16 14:05:23 UTC (rev 2207)
@@ -1534,6 +1534,29 @@
 does not have support for explicitly defining the backend when using
 ``createTable``.
 
+Keyword argument "conv" allows to pass a list of custom converters.
+Example::
+
+    import time
+    import sqlobject
+    import MySQLdb.converters
+
+    def _mysql_timestamp_converter(raw):
+             """Convert a MySQL TIMESTAMP to a floating point number representing
+             the seconds since the Un*x Epoch. It uses custom code the input seems
+             to be the new (MySQL 4.1+) timestamp format, otherwise code from the
+             MySQLdb module is used."""
+             if raw[4] == '-':
+                 return time.mktime(time.strptime(raw, '%Y-%m-%d %H:%M:%S'))
+             else:
+                 return MySQLdb.converters.mysql_timestamp_converter(raw)
+
+    conversions = MySQLdb.converters.conversions.copy()
+    conversions[MySQLdb.constants.FIELD_TYPE.TIMESTAMP] = _mysql_timestamp_converter
+
+    MySQLConnection = sqlobject.mysql.builder()
+    connection = MySQLConnection(user='foo', db='somedb', conv=conversions)
+
 Postgres
 --------
 

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

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

Author: phd
Date: 2007-01-16 07:00:51 -0700 (Tue, 16 Jan 2007)
New Revision: 2206

Modified:
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
Allow to pass "conv" parameter.


Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-01-16 13:58:04 UTC (rev 2205)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-01-16 14:00:51 UTC (rev 2206)
@@ -35,7 +35,7 @@
         else:
             self.need_unicode = False
         for key in ("unix_socket", "init_command",
-                "read_default_file", "read_default_group"):
+                "read_default_file", "read_default_group", "conv"):
             if key in kw:
                 self.kw[key] = col.popKey(kw, key)
         for key in ("connect_timeout", "compress", "named_pipe", "use_unicode",

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

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

Author: phd
Date: 2007-01-16 06:58:04 -0700 (Tue, 16 Jan 2007)
New Revision: 2205

Modified:
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
The port has to be an int.


Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-01-15 19:32:28 UTC (rev 2204)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-01-16 13:58:04 UTC (rev 2205)
@@ -17,7 +17,7 @@
     dbName = 'mysql'
     schemes = [dbName]
 
-    def __init__(self, db, user, password='', host='localhost', port=None, **kw):
+    def __init__(self, db, user, password='', host='localhost', port=0, **kw):
         global MySQLdb
         if MySQLdb is None:
             import MySQLdb

[SQL-CVS] [ sqlobject-Patches-1630441 ] revision 2150 firebird connectionFromURI *NIX db alias usage

[SourceForge.net <no...@so...>]

Patches item #1630441, was opened at 2007-01-08 13:39
Message generated for change (Comment added) made by mgfox
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Mike Vorozhbensky (mgfox)
Assigned to: Oleg Broytmann (phd)
Summary: revision 2150 firebird connectionFromURI *NIX db alias usage

Initial Comment:
when i try to use URI like "firebird://localhost/database" (database - database alias) in linux, i see error:
--- cut ---
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 160, in __iter__
    return iter(list(self.lazyIter()))
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 168, in lazyIter
    return conn.iterSelect(self)
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 373, in iterSelect
    return select.IterationClass(self, self.getConnection(),
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 239, in getConnection
    conn = self.makeConnection()
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/firebird/firebirdconnection.py", line 87, in makeConnection
    charset=self.charset,
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 472, in connect
    return Connection(*args, **keywords_args)
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 610, in __init__
    self._C_con = _k.attach_db(dsn, dpb, dialect)
OperationalError: (-902, 'isc_attach_database: I/O error for file "/database". Error while trying to open file. No such file or directory. ')

--- end cut ---

path fix this problem

----------------------------------------------------------------------

>Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-15 08:16

Message:
Logged In: YES 
user_id=1240394
Originator: YES

yes

----------------------------------------------------------------------

Comment By: Oleg Broytmann (phd)
Date: 2007-01-11 17:25

Message:
Logged In: YES 
user_id=4799
Originator: NO

Also I think I can now remove the code

        if os.name == 'nt' and path[0] == '/':
            # strip the leading slash off of db name/alias
            path = path[1:]

?

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-11 10:59

Message:
Logged In: YES 
user_id=1240394
Originator: YES

yes, your variant is better 

----------------------------------------------------------------------

Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 17:36

Message:
Logged In: YES 
user_id=4799
Originator: NO

Can I change

if path[-3:].lower() != 'fdb' and path[-3:].lower() != 'gdb':

to

if path[-3:].lower() not in ('fdb', 'gdb'):

?

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-08 13:49

Message:
Logged In: YES 
user_id=1240394
Originator: YES

bug also present in revision 2175

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1630441 ] revision 2150 firebird connectionFromURI *NIX db alias usage

[SourceForge.net <no...@so...>]

Patches item #1630441, was opened at 2007-01-08 13:39
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Mike Vorozhbensky (mgfox)
Assigned to: Oleg Broytmann (phd)
Summary: revision 2150 firebird connectionFromURI *NIX db alias usage

Initial Comment:
when i try to use URI like "firebird://localhost/database" (database - database alias) in linux, i see error:
--- cut ---
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 160, in __iter__
    return iter(list(self.lazyIter()))
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 168, in lazyIter
    return conn.iterSelect(self)
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 373, in iterSelect
    return select.IterationClass(self, self.getConnection(),
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 239, in getConnection
    conn = self.makeConnection()
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/firebird/firebirdconnection.py", line 87, in makeConnection
    charset=self.charset,
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 472, in connect
    return Connection(*args, **keywords_args)
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 610, in __init__
    self._C_con = _k.attach_db(dsn, dpb, dialect)
OperationalError: (-902, 'isc_attach_database: I/O error for file "/database". Error while trying to open file. No such file or directory. ')

--- end cut ---

path fix this problem

----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-01-11 17:25

Message:
Logged In: YES 
user_id=4799
Originator: NO

Also I think I can now remove the code

        if os.name == 'nt' and path[0] == '/':
            # strip the leading slash off of db name/alias
            path = path[1:]

?

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-11 10:59

Message:
Logged In: YES 
user_id=1240394
Originator: YES

yes, your variant is better 

----------------------------------------------------------------------

Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 17:36

Message:
Logged In: YES 
user_id=4799
Originator: NO

Can I change

if path[-3:].lower() != 'fdb' and path[-3:].lower() != 'gdb':

to

if path[-3:].lower() not in ('fdb', 'gdb'):

?

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-08 13:49

Message:
Logged In: YES 
user_id=1240394
Originator: YES

bug also present in revision 2175

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

[SQL-CVS] r2202 - in home/phd/SQLObject/paramstyles/sqlobject/versioning: . test

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

Author: phd
Date: 2007-01-11 07:14:00 -0700 (Thu, 11 Jan 2007)
New Revision: 2202

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py
   home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py
Log:
Merged patches from the revisions 2197:2201 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py	2007-01-10 21:35:55 UTC (rev 2201)
+++ home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py	2007-01-11 14:14:00 UTC (rev 2202)
@@ -18,7 +18,7 @@
 
     def getChangedFields(self):
         next = self.nextVersion()
-        columns = self.__class__.sqlmeta.columns
+        columns = self.masterClass.sqlmeta.columns
         fields = []
         for column in columns:
             if column not in ["dateArchived", "id", "masterID"]:
@@ -45,7 +45,11 @@
 
 
 class Versioning(object):
-    def __init__(self):
+    def __init__(self, extraCols = None):
+        if extraCols:
+            self.extraCols = extraCols
+        else:
+            self.extraCols = {}
         pass
 
     def __addtoclass__(self, soClass, name):
@@ -59,6 +63,8 @@
 
         getColumns (attrs, self.soClass)
 
+        attrs.update(self.extraCols)
+
         self.versionClass = type(self.soClass.__name__+'Versions',
                                  (Version,),
                                  attrs)

Modified: home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py	2007-01-10 21:35:55 UTC (rev 2201)
+++ home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py	2007-01-11 14:14:00 UTC (rev 2202)
@@ -39,8 +39,16 @@
     foreign = ForeignKey("Base")
     versions = Versioning()
 
+def _set_extra():
+    return "read all about it"
+
+class Extra(SQLObject):
+    name = StringCol()
+    versions = Versioning(extraCols={'extra' : StringCol(default=_set_extra())})
+
+
 def setup():
-    for cls in [MyClass, Base, Child, Government, Monarchy, VChild, HasForeign]:
+    for cls in [MyClass, Base, Child, Government, Monarchy, VChild, HasForeign, Extra]:
         if hasattr(cls, 'versions') and hasattr(cls, "_connection") and \
                 cls._connection.tableExists(cls.sqlmeta.table):
             setupClass(cls.versions.versionClass)
@@ -132,3 +140,10 @@
     has_foreign = HasForeign(foreign = base1)
     has_foreign.foreign = base2
     assert has_foreign.versions[0].foreign == base1
+
+def test_extra():
+    setup()
+    extra = Extra(name='title')
+    extra.name = 'new'
+    assert extra.versions[0].extra == 'read all about it'    
+    assert sorted(extra.versions[0].getChangedFields()) == ['Name']

[SQL-CVS] [ sqlobject-Patches-1630441 ] revision 2150 firebird connectionFromURI *NIX db alias usage

[SourceForge.net <no...@so...>]

Patches item #1630441, was opened at 2007-01-08 13:39
Message generated for change (Comment added) made by mgfox
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Mike Vorozhbensky (mgfox)
Assigned to: Oleg Broytmann (phd)
Summary: revision 2150 firebird connectionFromURI *NIX db alias usage

Initial Comment:
when i try to use URI like "firebird://localhost/database" (database - database alias) in linux, i see error:
--- cut ---
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 160, in __iter__
    return iter(list(self.lazyIter()))
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/sresults.py", line 168, in lazyIter
    return conn.iterSelect(self)
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 373, in iterSelect
    return select.IterationClass(self, self.getConnection(),
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/dbconnection.py", line 239, in getConnection
    conn = self.makeConnection()
  File "/usr/lib/python2.4/site-packages/SQLObject-0.9dev_r2147-py2.4.egg/sqlobject/firebird/firebirdconnection.py", line 87, in makeConnection
    charset=self.charset,
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 472, in connect
    return Connection(*args, **keywords_args)
  File "/var/lib/python-support/python2.4/kinterbasdb/__init__.py", line 610, in __init__
    self._C_con = _k.attach_db(dsn, dpb, dialect)
OperationalError: (-902, 'isc_attach_database: I/O error for file "/database". Error while trying to open file. No such file or directory. ')

--- end cut ---

path fix this problem

----------------------------------------------------------------------

>Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-11 10:59

Message:
Logged In: YES 
user_id=1240394
Originator: YES

yes, your variant is better 

----------------------------------------------------------------------

Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 17:36

Message:
Logged In: YES 
user_id=4799
Originator: NO

Can I change

if path[-3:].lower() != 'fdb' and path[-3:].lower() != 'gdb':

to

if path[-3:].lower() not in ('fdb', 'gdb'):

?

----------------------------------------------------------------------

Comment By: Mike Vorozhbensky (mgfox)
Date: 2007-01-08 13:49

Message:
Logged In: YES 
user_id=1240394
Originator: YES

bug also present in revision 2175

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1630441&group_id=74338

[SQL-CVS] r2201 - in SQLObject/trunk/sqlobject/versioning: . test

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

Author: novalis
Date: 2007-01-10 14:35:55 -0700 (Wed, 10 Jan 2007)
New Revision: 2201

Modified:
   SQLObject/trunk/sqlobject/versioning/__init__.py
   SQLObject/trunk/sqlobject/versioning/test/test_version.py
Log:
getChangedFields now works with extra cols

Modified: SQLObject/trunk/sqlobject/versioning/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/__init__.py	2007-01-10 21:30:34 UTC (rev 2200)
+++ SQLObject/trunk/sqlobject/versioning/__init__.py	2007-01-10 21:35:55 UTC (rev 2201)
@@ -18,7 +18,7 @@
 
     def getChangedFields(self):
         next = self.nextVersion()
-        columns = self.__class__.sqlmeta.columns
+        columns = self.masterClass.sqlmeta.columns
         fields = []
         for column in columns:
             if column not in ["dateArchived", "id", "masterID"]:

Modified: SQLObject/trunk/sqlobject/versioning/test/test_version.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 21:30:34 UTC (rev 2200)
+++ SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 21:35:55 UTC (rev 2201)
@@ -146,3 +146,4 @@
     extra = Extra(name='title')
     extra.name = 'new'
     assert extra.versions[0].extra == 'read all about it'    
+    assert sorted(extra.versions[0].getChangedFields()) == ['Name']

[SQL-CVS] r2200 - SQLObject/trunk/sqlobject/versioning/test

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

Author: novalis
Date: 2007-01-10 14:30:34 -0700 (Wed, 10 Jan 2007)
New Revision: 2200

Modified:
   SQLObject/trunk/sqlobject/versioning/test/test_version.py
Log:
oops

Modified: SQLObject/trunk/sqlobject/versioning/test/test_version.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 21:26:59 UTC (rev 2199)
+++ SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 21:30:34 UTC (rev 2200)
@@ -39,7 +39,6 @@
     foreign = ForeignKey("Base")
     versions = Versioning()
 
-<<<<<<< .mine
 def _set_extra():
     return "read all about it"
 

[SQL-CVS] r2199 - in SQLObject/trunk/sqlobject/versioning: . test

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

Author: novalis
Date: 2007-01-10 14:26:59 -0700 (Wed, 10 Jan 2007)
New Revision: 2199

Modified:
   SQLObject/trunk/sqlobject/versioning/__init__.py
   SQLObject/trunk/sqlobject/versioning/test/test_version.py
Log:
versions can now have extra columns

Modified: SQLObject/trunk/sqlobject/versioning/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/__init__.py	2007-01-10 16:59:13 UTC (rev 2198)
+++ SQLObject/trunk/sqlobject/versioning/__init__.py	2007-01-10 21:26:59 UTC (rev 2199)
@@ -45,7 +45,11 @@
 
 
 class Versioning(object):
-    def __init__(self):
+    def __init__(self, extraCols = None):
+        if extraCols:
+            self.extraCols = extraCols
+        else:
+            self.extraCols = {}
         pass
 
     def __addtoclass__(self, soClass, name):
@@ -59,6 +63,8 @@
 
         getColumns (attrs, self.soClass)
 
+        attrs.update(self.extraCols)
+
         self.versionClass = type(self.soClass.__name__+'Versions',
                                  (Version,),
                                  attrs)

Modified: SQLObject/trunk/sqlobject/versioning/test/test_version.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 16:59:13 UTC (rev 2198)
+++ SQLObject/trunk/sqlobject/versioning/test/test_version.py	2007-01-10 21:26:59 UTC (rev 2199)
@@ -39,8 +39,17 @@
     foreign = ForeignKey("Base")
     versions = Versioning()
 
+<<<<<<< .mine
+def _set_extra():
+    return "read all about it"
+
+class Extra(SQLObject):
+    name = StringCol()
+    versions = Versioning(extraCols={'extra' : StringCol(default=_set_extra())})
+
+
 def setup():
-    for cls in [MyClass, Base, Child, Government, Monarchy, VChild, HasForeign]:
+    for cls in [MyClass, Base, Child, Government, Monarchy, VChild, HasForeign, Extra]:
         if hasattr(cls, 'versions') and hasattr(cls, "_connection") and \
                 cls._connection.tableExists(cls.sqlmeta.table):
             setupClass(cls.versions.versionClass)
@@ -132,3 +141,9 @@
     has_foreign = HasForeign(foreign = base1)
     has_foreign.foreign = base2
     assert has_foreign.versions[0].foreign == base1
+
+def test_extra():
+    setup()
+    extra = Extra(name='title')
+    extra.name = 'new'
+    assert extra.versions[0].extra == 'read all about it'    

[SQL-CVS] [ sqlobject-Bugs-1622193 ] dbconnection close issue

[SourceForge.net <no...@so...>]

Bugs item #1622193, was opened at 2006-12-26 05:26
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1622193&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: General
Group: SQLObject release (specify)
>Status: Closed
>Resolution: Invalid
Priority: 5
Private: No
Submitted By: Tamakoshi Hiroki (tamakoshihiroki)
Assigned to: Nobody/Anonymous (nobody)
Summary: dbconnection close issue

Initial Comment:
Hi,

I found a bug in DBAPI.close() method at line 683 in dbconnection.py.

'del conn' may be in the above for loop.

----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 18:30

Message:
Logged In: YES 
user_id=4799
Originator: NO

I don't see how it can be above the loop where "conn" is defined.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1622193&group_id=74338

[SQL-CVS] [ sqlobject-Bugs-1621951 ] StringCol can't treat other encoding except "ASCII"

[SourceForge.net <no...@so...>]

Bugs item #1621951, was opened at 2006-12-25 14:58
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1621951&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: SQLObject release (specify)
>Status: Closed
>Resolution: Invalid
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
>Assigned to: Oleg Broytmann (phd)
Summary: StringCol can't treat other encoding except "ASCII"

Initial Comment:
Hi, I'm Chinese. I'm very like SQLObject. But, I found a encoding bug in the class StringValidator. This class is in the script "col.py". When I input a other encoding string input or output from database with StringCol it will raise a UnicodeEncodeError, because I use GBK encoding to access the string. But in StringValidator Only allow "acsii" encoding.

I have fix it, the new code is below:

import sys

class StringValidator(validators.Validator):

    def to_python(self, value, state):
        if value is None:
            return None
        if isinstance(value, unicode):
           return value.encode(sys.getdefaultencoding())
        return value

    def from_python(self, value, state):
        if value is None:
            return None
        if isinstance(value, str):
            return value
        if isinstance(value, unicode):
            return value.encode(sys.getdefaultencoding())
        return value

Then, I can use StringCol to access a "GBK" encoding string. Also I must set the default encoding before this:

import sys
reload(sys)
sys.setdefaultencoding("GBK")

Please fix it, Thanks.
SQLObject 0.7.1


----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 18:28

Message:
Logged In: YES 
user_id=4799
Originator: NO

This has been fixed in 0.7.2:

* Fixed a number of unicode-related problems with newer MySQLdb.

The encoding can now be set in the DB URI.

----------------------------------------------------------------------

Comment By: Nobody/Anonymous (nobody)
Date: 2006-12-25 15:02

Message:
Logged In: NO 

It's very surperise that I can't login. My account is gashero, and my
email is "har...@gm...". Thanks!!!!!

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1621951&group_id=74338

[SQL-CVS] [ sqlobject-Bugs-1621196 ] 0.7.2 bug in creating class fromDatabase

[SourceForge.net <no...@so...>]

Bugs item #1621196, was opened at 2006-12-23 12:48
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1621196&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: Firebird/Interbase
Group: SQLObject release (specify)
>Status: Closed
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
>Assigned to: Oleg Broytmann (phd)
Summary: 0.7.2 bug in creating class fromDatabase 

Initial Comment:
example:
--- cut ---
from sqlobject import *

sqlhub.processConnection = connectionForURI('firebird://localhost/wwweva')

class selPeople(SQLObject):
    class sqlmeta:
        fromDatabase = True
    pass
--- end cut ---

result:
--- cut ---
Traceback (most recent call last):
  File "test_from_Db.py", line 8, in ?
    class selPeople(SQLObject):
  File "d:\lang\python\lib\site-packages\SQLObject-0.7.2-py2.4.egg\sqlobject\declarative.py", line 109, in __new__
    cls.__classinit__(cls, new_attrs)
  File "d:\lang\python\lib\site-packages\SQLObject-0.7.2-py2.4.egg\sqlobject\main.py", line 782, in __classinit__
    cls.sqlmeta.addColumnsFromDatabase()
  File "d:\lang\python\lib\site-packages\SQLObject-0.7.2-py2.4.egg\sqlobject\main.py", line 427, in addColumnsFromDatabase
    for columnDef in conn.columnsFromSchema(sqlmeta.table, soClass):
  File "D:\Lang\Python\lib\site-packages\sqlobject-0.7.2-py2.4.egg\sqlobject\firebird\firebirdconnection.py", line 193, in columnsFromSchema
    colClass, kw = self.guessClass(t.strip(), flength, fscale)
  File "D:\Lang\Python\lib\site-packages\sqlobject-0.7.2-py2.4.egg\sqlobject\firebird\firebirdconnection.py", line 215, in guessClass
    return col.StringCol, {'length': flength,
NameError: global name 'col' is not defined
--- end cut ---

FIX for this bug:
file: sqlobject\firebird\firebirdconnection.py modify line 129
from: colClass, kw = self.guessClass(t, flength, fscale)
to:  colClass, kw = self.guessClass(t.strip(), flength, fscale)

file: sqlobject\firebird\firebirdconnection.py 
insert line 2: import sqlobject.col as col



----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 18:21

Message:
Logged In: YES 
user_id=4799
Originator: NO

Fixed in the revision 2197. Thank you!

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1621196&group_id=74338

[SQL-CVS] r2197 - in SQLObject/branches/0.7-bugfix: docs sqlobject/firebird

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

Author: phd
Date: 2007-01-10 08:20:46 -0700 (Wed, 10 Jan 2007)
New Revision: 2197

Modified:
   SQLObject/branches/0.7-bugfix/docs/News.txt
   SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py
Log:
Fixed a missed import in firebirdconnection.py (bug 1621196).


Modified: SQLObject/branches/0.7-bugfix/docs/News.txt
===================================================================
--- SQLObject/branches/0.7-bugfix/docs/News.txt	2007-01-10 15:11:08 UTC (rev 2196)
+++ SQLObject/branches/0.7-bugfix/docs/News.txt	2007-01-10 15:20:46 UTC (rev 2197)
@@ -22,6 +22,8 @@
 * Fixed a bug in FirebirdConnection caused by column names having trailing
   spaces.
 
+* Fixed a missed import in firebirdconnection.py.
+
 SQLObject 0.7.2
 ===============
 

Modified: SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py	2007-01-10 15:11:08 UTC (rev 2196)
+++ SQLObject/branches/0.7-bugfix/sqlobject/firebird/firebirdconnection.py	2007-01-10 15:20:46 UTC (rev 2197)
@@ -1,7 +1,8 @@
+import re
+import os
 from sqlobject.dbconnection import DBAPI
+from sqlobject import col
 kinterbasdb = None
-import re
-import os
 
 class FirebirdConnection(DBAPI):
 

[SQL-CVS] r2196 - SQLObject/branches/0.7-bugfix/docs

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

Author: phd
Date: 2007-01-10 08:11:08 -0700 (Wed, 10 Jan 2007)
New Revision: 2196

Modified:
   SQLObject/branches/0.7-bugfix/docs/links.txt
Log:
Removed stale links.


Modified: SQLObject/branches/0.7-bugfix/docs/links.txt
===================================================================
--- SQLObject/branches/0.7-bugfix/docs/links.txt	2007-01-10 15:09:46 UTC (rev 2195)
+++ SQLObject/branches/0.7-bugfix/docs/links.txt	2007-01-10 15:11:08 UTC (rev 2196)
@@ -11,9 +11,6 @@
 * `sqlos Zope 3 SQLObject integration
   <http://codespeak.net/z3/sqlos/>`_.
 
-* `Subway <http://subway.python-hosting.com/>`_ Web Framework;
-  integrates tightly with SQLObject for its models.
-
 * `Nabu <http://furius.ca/nabu/>`_, a publishing system.
 
 * `Ultra Gleeper <http://www.crummy.com/software/UltraGleeper/>`_, a
@@ -35,9 +32,6 @@
 * `Anemon <http://anemon.org/wikini/wakka.php?wiki=FirstPage>`_ DHCP
   server.
 
-* `Planet Plus <http://planetplus.python-hosting.com/>`_; a `CherryPy
-  <http://cherrypy.org>`_ public feed aggregator.
-
 * `Guten <http://guten.sourceforge.net/>`_; an application for
   browsing, reading, and managing books from `Project Gutenberg
   <http://www.gutenberg.org/>`_.
@@ -48,9 +42,6 @@
 * `Canonical's SQLObject guide
   <https://wiki.launchpad.canonical.com/SQLObjectGuide>`_.
 
-* `Webware/Paste + SQLObject Tutorial
-  <http://pythonpaste.org/docs/TodoTutorial.html>`_.
-
 * `SQLObject and CherryPy
   <http://www.cherrypy.org/wiki/SQLObjectThreadPerConnection>`_.
 

[SQL-CVS] [ sqlobject-Bugs-1618346 ] Website bad links

[SourceForge.net <no...@so...>]

Bugs item #1618346, was opened at 2006-12-18 22:52
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1618346&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: General
Group: None
>Status: Closed
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: Website bad links

Initial Comment:
Found from this page on SQLObject site:

http://sqlobject.org/links.html

These links are bad:

http://subway.python-hosting.com/
http://pythonpaste.org/docs/TodoTutorial.html
http://planetplus.python-hosting.com/

Regards,

Brian Ray (http://kazavoo.com)

----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-01-10 18:10

Message:
Logged In: YES 
user_id=4799
Originator: NO

Fixed in the revision 2195. The site will be updated at the next release.
Thank you!

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1618346&group_id=74338

[SQL-CVS] r2195 - SQLObject/docs

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

Author: phd
Date: 2007-01-10 08:09:46 -0700 (Wed, 10 Jan 2007)
New Revision: 2195

Modified:
   SQLObject/docs/links.txt
Log:
Removed stale links.


Modified: SQLObject/docs/links.txt
===================================================================
--- SQLObject/docs/links.txt	2007-01-10 14:32:03 UTC (rev 2194)
+++ SQLObject/docs/links.txt	2007-01-10 15:09:46 UTC (rev 2195)
@@ -42,9 +42,6 @@
 * `sqlos Zope 3 SQLObject integration
   <http://codespeak.net/z3/sqlos/>`_.
 
-* `Subway <http://subway.python-hosting.com/>`_ Web Framework;
-  integrates tightly with SQLObject for its models.
-
 * `TurboGears <http://turbogears.org/>`_ Web Framework: also integrates
   with SQLObject.
 
@@ -78,9 +75,6 @@
 * `Anemon <http://anemon.org/wikini/wakka.php?wiki=FirstPage>`_ DHCP
   server.
 
-* `Planet Plus <http://planetplus.python-hosting.com/>`_; a `CherryPy
-  <http://cherrypy.org>`_ public feed aggregator.
-
 * `Guten <http://guten.sourceforge.net/>`_; an application for
   browsing, reading, and managing books from `Project Gutenberg
   <http://www.gutenberg.org/>`_.