From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 13 Jan 2009 15:56:51 +0000 (+0000)
Subject: prefer this methods
X-Git-Tag: rel_0_5_1~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49f6342e37032cc6e9efe6eb412f9b848e99c4c4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

prefer this methods
---

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index cf47279e8a..3b4880403a 100644
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -739,4 +739,3 @@ def _undefer_column_name(key, column):
         column.key = key
     if column.name is None:
         column.name = key
-    util.reset_memoized(column, 'description')
\ No newline at end of file
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 792a7e9239..d454bc7cff 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -609,7 +609,9 @@ class Column(SchemaItem, expression.ColumnClause):
                 "Unknown arguments passed to Column: " + repr(kwargs.keys()))
 
     def __str__(self):
-        if self.table is not None:
+        if self.name is None:
+            return "(no name)"
+        elif self.table is not None:
             if self.table.named_with_column:
                 return (self.table.description + "." + self.description)
             else:
@@ -617,13 +619,6 @@ class Column(SchemaItem, expression.ColumnClause):
         else:
             return self.description
 
-    @util.memoized_property
-    def description(self):
-        if not self.name:
-            return "(no name)"
-        else:
-            return self.name.encode('ascii', 'backslashreplace')
-
     @property
     def bind(self):
         return self.table.bind