work through dialects

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/sqlalchemy/dialects/mssql/adodbapi.py b/lib/sqlalchemy/dialects/mssql/adodbapi.py
index 080382d55..167b4e807 100644
--- a/lib/sqlalchemy/dialects/mssql/adodbapi.py
+++ b/lib/sqlalchemy/dialects/mssql/adodbapi.py
@@ -44,7 +44,7 @@ class MSDialect_adodbapi(MSDialect):
 
     @classmethod
     def import_dbapi(cls):
-        from . import adodbapi as module
+        import adodbapi as module
         return module
 
     colspecs = util.update_copy(
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 827cf0186..c5b86b887 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -295,7 +295,7 @@ class _MSDate(sqltypes.Date):
         def process(value):
             if isinstance(value, datetime.datetime):
                 return value.date()
-            elif isinstance(value, str):
+            elif isinstance(value, util.string_type):
                 return datetime.date(*[
                         int(x or 0)
                         for x in self._reg.match(value).groups()
@@ -328,7 +328,7 @@ class TIME(sqltypes.TIME):
         def process(value):
             if isinstance(value, datetime.datetime):
                 return value.time()
-            elif isinstance(value, str):
+            elif isinstance(value, util.string_type):
                 return datetime.time(*[
                         int(x or 0)
                         for x in self._reg.match(value).groups()])
@@ -1002,7 +1002,7 @@ class MSDDLCompiler(compiler.DDLCompiler):
         # handle other included columns
         if index.kwargs.get("mssql_include"):
             inclusions = [index.table.c[col]
-                            if isinstance(col, str) else col
+                            if isinstance(col, util.string_type) else col
                           for col in index.kwargs["mssql_include"]]
 
             text += " INCLUDE (%s)" \
@@ -1150,7 +1150,7 @@ class MSDialect(default.DefaultDialect):
             try:
                 default_schema_name = connection.scalar(query, name=user_name)
                 if default_schema_name is not None:
-                    return str(default_schema_name)
+                    return util.text_type(default_schema_name)
             except:
                 pass
         return self.schema_name