diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-04 13:25:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-04 13:25:07 +0000 |
| commit | 3f315db8dab8a859e7204e7ac184ea9796273a74 (patch) | |
| tree | 9cebac9ef50c2674be525c1293c322246aae6a2d /openstack | |
| parent | 7ce54410485b33cffc39c7ffb96eae422b88601c (diff) | |
| parent | 6d276814bf91b5406403191c76ea59f81a32f568 (diff) | |
| download | oslo-3f315db8dab8a859e7204e7ac184ea9796273a74.tar.gz oslo-3f315db8dab8a859e7204e7ac184ea9796273a74.tar.xz oslo-3f315db8dab8a859e7204e7ac184ea9796273a74.zip | |
Merge "Enable H306 hacking check."
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 2 | ||||
| -rw-r--r-- | openstack/common/policy.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py index fbc5c91..dbc0bc8 100644 --- a/openstack/common/db/sqlalchemy/session.py +++ b/openstack/common/db/sqlalchemy/session.py @@ -256,8 +256,8 @@ from sqlalchemy.pool import NullPool, StaticPool from sqlalchemy.sql.expression import literal_column from openstack.common.db import exception -from openstack.common import log as logging from openstack.common.gettextutils import _ +from openstack.common import log as logging from openstack.common import timeutils DEFAULT = 'DEFAULT' diff --git a/openstack/common/policy.py b/openstack/common/policy.py index 3669f9b..f3e62ba 100644 --- a/openstack/common/policy.py +++ b/openstack/common/policy.py @@ -59,13 +59,13 @@ as it allows particular rules to be explicitly disabled. import abc import re import urllib +import urllib2 from oslo.config import cfg import six -import urllib2 -from openstack.common.gettextutils import _ from openstack.common import fileutils +from openstack.common.gettextutils import _ from openstack.common import jsonutils from openstack.common import log as logging |