summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-10-13 21:03:49 +0000
committerJason Kirtland <jek@discorporate.us>2007-10-13 21:03:49 +0000
commit666997c8fa55e2f2f828c70ec3784a1dfe0951a7 (patch)
treef0faced49a9cd5754e02726c6e764bc0515c1302 /lib/sqlalchemy/sql
parent059b939dbaa3cc56c2b2c3a5ed067f8f196ab8ac (diff)
downloadsqlalchemy-666997c8fa55e2f2f828c70ec3784a1dfe0951a7.tar.gz
Assorted unused imports from pyflakes, docstring tweaks, formatting.
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/__init__.py1
-rw-r--r--lib/sqlalchemy/sql/expression.py9
-rw-r--r--lib/sqlalchemy/sql/operators.py9
3 files changed, 11 insertions, 8 deletions
diff --git a/lib/sqlalchemy/sql/__init__.py b/lib/sqlalchemy/sql/__init__.py
index 06b9f1f75..c966f396a 100644
--- a/lib/sqlalchemy/sql/__init__.py
+++ b/lib/sqlalchemy/sql/__init__.py
@@ -1,3 +1,2 @@
from sqlalchemy.sql.expression import *
from sqlalchemy.sql.visitors import ClauseVisitor, NoColumnVisitor
-
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 6f3ee94ab..90c670ce3 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -6,10 +6,9 @@
"""Defines the base components of SQL expression trees.
-
All components are derived from a common base class
-[sqlalchemy.sql.expression#ClauseElement]. Common behaviors are organized based
-on class hierarchies, in some cases via mixins.
+[sqlalchemy.sql.expression#ClauseElement]. Common behaviors are organized
+based on class hierarchies, in some cases via mixins.
All object construction from this package occurs via functions which
in some cases will construct composite ``ClauseElement`` structures
@@ -26,10 +25,11 @@ classes usually have few or no public methods and are less guaranteed
to stay the same in future releases.
"""
+import re
from sqlalchemy import util, exceptions
from sqlalchemy.sql import operators, visitors
from sqlalchemy import types as sqltypes
-import re
+
__all__ = [
'Alias', 'ClauseElement',
@@ -43,6 +43,7 @@ __all__ = [
'literal_column', 'not_', 'null', 'or_', 'outparam', 'outerjoin', 'select',
'subquery', 'table', 'text', 'union', 'union_all', 'update', ]
+
BIND_PARAMS = re.compile(r'(?<![:\w\x5c]):(\w+)(?!:)', re.UNICODE)
def desc(column):
diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index c1d2ebc87..cf8aeb71d 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -1,6 +1,10 @@
-"""define opeators used in SQL expressions"""
+# This module is part of SQLAlchemy and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
-from operator import and_, or_, inv, add, mul, sub, div, mod, truediv, lt, le, ne, gt, ge, eq
+"""Defines operators used in SQL expressions."""
+
+from operator import and_, or_, inv, add, mul, sub, div, mod, truediv, \
+ lt, le, ne, gt, ge, eq
def from_():
raise NotImplementedError()
@@ -58,4 +62,3 @@ def desc_op(a):
def asc_op(a):
return a.asc()
-