diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r-- | lib/sqlalchemy/sql/__init__.py | 4 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 8 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/expression.py | 8 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/functions.py | 8 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/operators.py | 2 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/util.py | 6 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/visitors.py | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/lib/sqlalchemy/sql/__init__.py b/lib/sqlalchemy/sql/__init__.py index eac845dcd..e25bb3160 100644 --- a/lib/sqlalchemy/sql/__init__.py +++ b/lib/sqlalchemy/sql/__init__.py @@ -4,7 +4,7 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php -from sqlalchemy.sql.expression import ( +from .expression import ( Alias, ClauseElement, ColumnCollection, @@ -62,7 +62,7 @@ from sqlalchemy.sql.expression import ( update, ) -from sqlalchemy.sql.visitors import ClauseVisitor +from .visitors import ClauseVisitor __tmp = locals().keys() __all__ = sorted([i for i in __tmp if not i.startswith('__')]) diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 96ca1c57d..fe56b1a83 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -24,10 +24,10 @@ To generate user-defined SQL strings, see import re import sys -from sqlalchemy import schema, engine, util, exc -from sqlalchemy.sql import operators, functions, util as sql_util, \ - visitors -from sqlalchemy.sql import expression as sql +from .. import schema, engine, util, exc +from . import ( + operators, functions, util as sql_util, visitors, expression as sql +) import decimal RESERVED_WORDS = set([ diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 6bf31e094..4be8a976d 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -29,10 +29,10 @@ to stay the same in future releases. import itertools, re from operator import attrgetter -from sqlalchemy import util, exc -from sqlalchemy.sql import operators -from sqlalchemy.sql.operators import Operators, ColumnOperators -from sqlalchemy.sql.visitors import Visitable, cloned_traverse +from .. import util, exc +from . import operators +from .operators import ColumnOperators +from .visitors import Visitable, cloned_traverse import operator functions = util.importlater("sqlalchemy.sql", "functions") diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py index aac97cff2..22f127fcc 100644 --- a/lib/sqlalchemy/sql/functions.py +++ b/lib/sqlalchemy/sql/functions.py @@ -4,12 +4,12 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php -from sqlalchemy import types as sqltypes, schema -from sqlalchemy.sql.expression import ( +from .. import types as sqltypes, schema +from .expression import ( ClauseList, Function, _literal_as_binds, text, _type_from_args ) -from sqlalchemy.sql import operators -from sqlalchemy.sql.visitors import VisitableType +from . import operators +from .visitors import VisitableType class _GenericMeta(VisitableType): def __call__(self, *args, **kwargs): diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py index 0c779ec43..866cc8f06 100644 --- a/lib/sqlalchemy/sql/operators.py +++ b/lib/sqlalchemy/sql/operators.py @@ -17,7 +17,7 @@ from operator import ( from operator import (div,) # end Py2K -from sqlalchemy.util import symbol +from ..util import symbol class Operators(object): """Base of comparison and logical operators. diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index c486f5cc1..83a75a77f 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -4,9 +4,9 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php -from sqlalchemy import exc, schema, util, sql, types as sqltypes -from sqlalchemy.util import topological -from sqlalchemy.sql import expression, operators, visitors +from .. import exc, schema, util, sql +from ..util import topological +from . import expression, operators, visitors from itertools import chain from collections import deque diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py index 8a06982fc..a79168e75 100644 --- a/lib/sqlalchemy/sql/visitors.py +++ b/lib/sqlalchemy/sql/visitors.py @@ -25,7 +25,7 @@ http://techspot.zzzeek.org/2008/01/23/expression-transformations/ from collections import deque import re -from sqlalchemy import util +from .. import util import operator __all__ = ['VisitableType', 'Visitable', 'ClauseVisitor', |