[SQL-CVS] r1231 - in home/phd/SQLObject/paramstyles: docs sqlobject

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

Author: phd
Date: 2005-11-08 08:20:16 +0000 (Tue, 08 Nov 2005)
New Revision: 1231

Modified:
   home/phd/SQLObject/paramstyles/docs/links.txt
   home/phd/SQLObject/paramstyles/sqlobject/joins.py
Log:
Merged patches from the revisions 1225:1230 from the trunk

Modified: home/phd/SQLObject/paramstyles/docs/links.txt
===================================================================
--- home/phd/SQLObject/paramstyles/docs/links.txt	2005-11-08 04:52:02 UTC (rev 1230)
+++ home/phd/SQLObject/paramstyles/docs/links.txt	2005-11-08 08:20:16 UTC (rev 1231)
@@ -20,6 +20,10 @@
 * `Pylons <http://pylons.groovie.org/>`_ Web Framework: `Myghty
   <http://www.myghty.org/>`_ based, with SQLObject integration.
 
+* `Catwalk <http://checkandshare.com/catwalk/>`_ is a web-based
+  SQLObject browser and object editor (included in TurboGears)
+  (`related blog items <http://www.checkandshare.com/blog/?cat=8>`_).
+
 * `Nabu <http://furius.ca/nabu/>`_, a publishing system.
 
 * `Ultra Gleeper <http://www.crummy.com/software/UltraGleeper/>`_, a
@@ -31,9 +35,11 @@
   <http://svn.rdflib.net/trunk/rdflib/backends/_sqlobject.py>`_.
 
 * Enfold Systems' `EnTransit
-  <http://www.enfoldsystems.com/About/Talks/entransit-tutorial.pdf>`_ 
-  utilizes SQLObject and rdflib for storing transactional content 
-  from Zope.
+  <http://www.enfoldsystems.com/About/Talks/entransit-tutorial.pdf>`_
+  utilizes SQLObject and rdflib for storing transactional content from
+  Zope.  Also by Enfold is `Sample Inventory Program
+  <http://www.enfoldsystems.com/Products/Open/SIP>`_, an Open Source
+  Laboratory Inventory Management Systems.
 
 * `Bauble <http://bauble.belizebotanic.org/>`_, a Biodiversity
   Collection Manager.
@@ -74,4 +80,10 @@
   <http://formencode.org>`_.
 
 * `Translation of SQLObject documentation to Japanese
-  <http://www.python.jp/~ymasuda/sqlobject/SQLObject.html>`_
+  <http://www.python.jp/~ymasuda/sqlobject/SQLObject.html>`_.
+
+* `How to Use Database Agnostic SQL in SQLObject
+  <http://groovie.org/articles/2005/11/01/how-to-use-database-agnostic-sql-in-sqlobject>`_.
+
+* `Using SQLObject with memcached
+  <http://www.zachary.com/s/blog/2005/09/18/sqlobject_and_memcached,_part_1>`_.

Modified: home/phd/SQLObject/paramstyles/sqlobject/joins.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/joins.py	2005-11-08 04:52:02 UTC (rev 1230)
+++ home/phd/SQLObject/paramstyles/sqlobject/joins.py	2005-11-08 08:20:16 UTC (rev 1231)
@@ -370,7 +370,7 @@
     def __getattr__(self, attr):
         # @@: This passes through private variable access too... should it?
         # Also magic methods, like __str__
-        return getattr(self, select, attr)
+        return getattr(self.select, attr)
 
     def __repr__(self):
         return '<%s for: %s>' % (self.__class__.__name__, repr(self.select))