minor cleanup

Author: dlo

django_pyodbc/base.py

@@ -2,13 +2,17 @@
 MS SQL Server database backend for Django.
 """
 
+import logging
+import os
+import re
+import warnings
+
 try:
     import pyodbc as Database
 except ImportError, e:
     from django.core.exceptions import ImproperlyConfigured
     raise ImproperlyConfigured("Error loading pyodbc module: %s" % e)
 
-import re
 m = re.match(r'(\d+)\.(\d+)\.(\d+)(?:-beta(\d+))?', Database.version)
 vlist = list(m.groups())
 if vlist[3] is None: vlist[3] = '9999'
@@ -41,11 +45,11 @@
 from django_pyodbc.client import DatabaseClient
 from django_pyodbc.creation import DatabaseCreation
 from django_pyodbc.introspection import DatabaseIntrospection
-import os
-import warnings
 
 warnings.filterwarnings('error', 'The DATABASE_ODBC.+ is deprecated', DeprecationWarning, __name__, 0)
 
+logger = logging.getLogger(__name__)
+
 try:
     if hasattr(settings, 'DATABASE_COLLATION'):
         warnings.warn(

django_pyodbc/query.py

@@ -4,6 +4,7 @@
 """
 
 from datetime import datetime
+from django_pyodbc import aggregates as pyodbc_aggregates
 
 REV_ODIR = {
     'ASC': 'DESC',
@@ -36,8 +37,7 @@ def query_class(QueryClass):
         pass
 
     class PyOdbcSSQuery(QueryClass):
-        from django_pyodbc import aggregates
-        aggregates_module = aggregates
+        aggregates_module = pyodbc_aggregates
 
         def __init__(self, *args, **kwargs):
             super(PyOdbcSSQuery, self).__init__(*args, **kwargs)