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

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

Author: phd
Date: 2009-08-13 10:02:37 -0600 (Thu, 13 Aug 2009)
New Revision: 3948

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
Log:
Removed the last remaininig deprecated attribute.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-08-12 10:40:32 UTC (rev 3947)
+++ SQLObject/trunk/docs/News.txt	2009-08-13 16:02:37 UTC (rev 3948)
@@ -10,6 +10,11 @@
 SQLObject (trunk)
 =================
 
+Features & Interface
+--------------------
+
+* Removed the last remaininig deprecated attribute.
+
 SQLObject 0.11
 ==============
 

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2009-08-12 10:40:32 UTC (rev 3947)
+++ SQLObject/trunk/sqlobject/main.py	2009-08-13 16:02:37 UTC (rev 3948)
@@ -658,9 +658,9 @@
 warnings_level = 1
 exception_level = None
 # Current levels:
-#  1) Actively deprecated in version after 0.9; removed after
-#  2) Deprecated after 1 (0.9?)
-#  3) Deprecated after 2 (0.10?)
+#  1) Actively deprecated
+#  2) Deprecated after 1
+#  3) Deprecated after 2
 
 def deprecated(message, level=1, stacklevel=2):
     if exception_level is not None and exception_level <= level:
@@ -814,8 +814,6 @@
 
         classregistry.registry(cls.sqlmeta.registry).addClass(cls)
 
-    _expired = _sqlmeta_attr('expired', 1)
-
     # @classmethod
     def _SO_setupSqlmeta(cls, new_attrs, is_base):
         """
@@ -866,7 +864,7 @@
         been deprecated; they are moved to the sqlmeta class, and
         a deprecation warning is given.
         """
-        for attr in ['_expired']:
+        for attr in ():
             if new_attrs.has_key(attr):
                 deprecated("%r is deprecated and read-only; please do "
                            "not use it in your classes until it is fully "