summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-02-04 17:47:27 +0000
committerMark McLoughlin <markmc@redhat.com>2013-02-07 15:25:29 -0500
commit8e04d2760f421ef43c18d046cf0392f9e631b951 (patch)
treed355968d5bc5a73b6d3e3cb12b1b5a2f6e67e57c
parentcec0f5b07abaaae989619536df25d70166fb343e (diff)
Minor tweak to make update.py happy
Fairly lame to do this instead of just fixing update.py, but we seem to do it this way everywhere else, so ... Change-Id: Ie1cebcfec57c6138b9b726d7d3bc6e0ea456f146
-rw-r--r--openstack/common/db/sqlalchemy/session.py2
-rw-r--r--tests/unit/db/sqlalchemy/test_models.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py
index 99c214b..2c714b1 100644
--- a/openstack/common/db/sqlalchemy/session.py
+++ b/openstack/common/db/sqlalchemy/session.py
@@ -259,7 +259,7 @@ from sqlalchemy.pool import NullPool, StaticPool
from sqlalchemy.sql.expression import literal_column
from openstack.common import cfg
-import openstack.common.log as logging
+from openstack.common import log as logging
from openstack.common.gettextutils import _
from openstack.common import timeutils
diff --git a/tests/unit/db/sqlalchemy/test_models.py b/tests/unit/db/sqlalchemy/test_models.py
index 17f1c1b..cd1a664 100644
--- a/tests/unit/db/sqlalchemy/test_models.py
+++ b/tests/unit/db/sqlalchemy/test_models.py
@@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import openstack.common.db.sqlalchemy.models as models
+from openstack.common.db.sqlalchemy import models
from tests import utils as test_utils