[SQL-CVS] r2460 - SQLObject/branches/sqlbuilder-sresults/sqlobject

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

Author: luke
Date: 2007-03-27 16:04:50 -0600 (Tue, 27 Mar 2007)
New Revision: 2460

Modified:
   SQLObject/branches/sqlbuilder-sresults/sqlobject/conftest.py
   SQLObject/branches/sqlbuilder-sresults/sqlobject/converters.py
   SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py
Log:
Remove hokey sqlrepr-caching

Modified: SQLObject/branches/sqlbuilder-sresults/sqlobject/conftest.py
===================================================================
--- SQLObject/branches/sqlbuilder-sresults/sqlobject/conftest.py	2007-03-27 21:49:09 UTC (rev 2459)
+++ SQLObject/branches/sqlbuilder-sresults/sqlobject/conftest.py	2007-03-27 22:04:50 UTC (rev 2460)
@@ -16,7 +16,7 @@
 except ImportError: # Python 2.2
     pass
 else:
-    pkg_resources.require('SQLObject')
+    pass #pkg_resources.require('SQLObject')
 
 connectionShortcuts = {
     'mysql': 'mysql://test@localhost/test',

Modified: SQLObject/branches/sqlbuilder-sresults/sqlobject/converters.py
===================================================================
--- SQLObject/branches/sqlbuilder-sresults/sqlobject/converters.py	2007-03-27 21:49:09 UTC (rev 2459)
+++ SQLObject/branches/sqlbuilder-sresults/sqlobject/converters.py	2007-03-27 22:04:50 UTC (rev 2460)
@@ -237,20 +237,4 @@
                   (type(obj), repr(obj))
         return converter(obj, db)
     else:
-        doCache = hasattr(db, 'doSQLReprCache')
-        ret = None
-        if doCache:
-            cache = getattr(obj, '_sqlreprCache', {})
-            if not isinstance(cache, dict):
-                #Alias etc
-                cache = {}
-            ret = cache.get(db, None)
-        if ret is None:
-            ret = reprFunc(db)
-            if doCache:
-                try:
-                    cache[db] = ret
-                    obj._sqlreprCache = cache
-                except TypeError:
-                    pass
-        return ret
+        return reprFunc(db)

Modified: SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py
===================================================================
--- SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py	2007-03-27 21:49:09 UTC (rev 2459)
+++ SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py	2007-03-27 22:04:50 UTC (rev 2460)
@@ -188,28 +188,13 @@
     def tablesUsed(self, db):
         return self.tablesUsedDict(db).keys()
     def tablesUsedDict(self, db):
-        doCache = hasattr(db, 'doTablesUsedCache')
-        tables = None
-        if doCache:
-            cache = getattr(self, '_tablesUsedCache', {})
-            if not isinstance(cache, dict):
-                #Alias etc
-                cache = {}
-            tables = cache.get(db, None)
-        if tables is None:
-            tables = {}
-            for table in self.tablesUsedImmediate():
-                if hasattr(table, '__sqlrepr__'):
-                    table = sqlrepr(table, db)
-                tables[table] = 1
-            for component in self.components():
-                tables.update(tablesUsedDict(component, db))
-            if doCache:
-                try:
-                    cache[db] = tables
-                    self._tablesUsedCache = cache
-                except TypeError:
-                    pass
+        tables = {}
+        for table in self.tablesUsedImmediate():
+            if hasattr(table, '__sqlrepr__'):
+                table = sqlrepr(table, db)
+            tables[table] = 1
+        for component in self.components():
+            tables.update(tablesUsedDict(component, db))
         return tables
     def tablesUsedImmediate(self):
         return []