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

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

Author: phd
Date: Sun May 29 05:53:58 2011
New Revision: 4396

Log:
Merged revisions 4393:4395 from branch 1.0: A syntax incompatibility was fixed
in SQLiteConnection that prevented SQLObject to be used with Python 2.4.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sun May 29 05:52:09 2011	(r4395)
+++ SQLObject/trunk/docs/News.txt	Sun May 29 05:53:58 2011	(r4396)
@@ -28,6 +28,12 @@
 
 * All 'mydict.has_key(name)' checks were replaced with 'name in mydict'.
 
+SQLObject 1.0.1
+===============
+
+* A syntax incompatibility was fixed in SQLiteConnection that prevented
+  SQLObject to be used with Python 2.4.
+
 SQLObject 1.0.0
 ===============
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Sun May 29 05:52:09 2011	(r4395)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Sun May 29 05:53:58 2011	(r4396)
@@ -100,7 +100,7 @@
         assert host is None and port is None, (
             "SQLite can only be used locally (with a URI like "
             "sqlite:/file or sqlite:///file, not sqlite://%s%s)" %
-            (host, ':%r' % port if port else ''))
+            (host, port and ':%r' % port or ''))
         assert user is None and password is None, (
             "You may not provide usernames or passwords for SQLite "
             "databases")