summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-02-24 08:53:26 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-02-24 08:53:26 +0000
commit98d54ac067b4b9ddd6adb73468ea3f2d9d9b87ee (patch)
tree683e0af5d42a324b5f9d1d2c603116af4e86a429 /lib/sqlalchemy/sql/expression.py
parentb80245d7460af17a7f186ade0dd203987739cffd (diff)
downloadsqlalchemy-98d54ac067b4b9ddd6adb73468ea3f2d9d9b87ee.tar.gz
silliness reduction
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index e39487c54..56629a6ca 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -1424,17 +1424,15 @@ class ColumnElement(ClauseElement, _CompareMixin):
"""
- if name is not None:
+ if name:
co = _ColumnClause(name, selectable, type_=getattr(self, 'type', None))
- co.proxies = [self]
- selectable.columns[name]= co
- return co
else:
name = str(self)
co = _ColumnClause(self.anon_label.name, selectable, type_=getattr(self, 'type', None))
- co.proxies = [self]
- selectable.columns[name] = co
- return co
+
+ co.proxies = [self]
+ selectable.columns[name]= co
+ return co
def anon_label(self):
"""provides a constant 'anonymous label' for this ColumnElement.
@@ -3417,13 +3415,13 @@ class Select(_SelectBaseMixin, FromClause):
yield t
def bind(self):
- if self._bind is not None:
+ if self._bind:
return self._bind
for f in self._froms:
if f is self:
continue
e = f.bind
- if e is not None:
+ if e:
self._bind = e
return e
# look through the columns (largely synomous with looking
@@ -3432,7 +3430,7 @@ class Select(_SelectBaseMixin, FromClause):
if getattr(c, 'table', None) is self:
continue
e = c.bind
- if e is not None:
+ if e:
self._bind = e
return e
return None