summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-01-13 15:56:51 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-01-13 15:56:51 +0000
commit49f6342e37032cc6e9efe6eb412f9b848e99c4c4 (patch)
treed3b5f1406ab03ea4e2731dfc1f1278271d4df21f
parent3e3f309cf99b0123be4e7295891e5531b137e1fb (diff)
downloadsqlalchemy-49f6342e37032cc6e9efe6eb412f9b848e99c4c4.tar.gz
prefer this methods
-rw-r--r--lib/sqlalchemy/ext/declarative.py1
-rw-r--r--lib/sqlalchemy/schema.py11
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index cf47279e8..3b4880403 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 792a7e923..d454bc7cf 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