diff --git a/nova/db/__init__.py b/nova/db/__init__.py index 054b7ac945..8ae248cf99 100644 --- a/nova/db/__init__.py +++ b/nova/db/__init__.py @@ -20,4 +20,4 @@ DB abstraction for Nova """ -from nova.db.api import * +from nova.db.api import * # noqa diff --git a/nova/ipv6/__init__.py b/nova/ipv6/__init__.py index 7abdae5e45..711c7ad136 100644 --- a/nova/ipv6/__init__.py +++ b/nova/ipv6/__init__.py @@ -14,4 +14,4 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.ipv6.api import * +from nova.ipv6.api import * # noqa diff --git a/nova/tests/api/__init__.py b/nova/tests/api/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/api/__init__.py +++ b/nova/tests/api/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/api/ec2/__init__.py b/nova/tests/api/ec2/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/api/ec2/__init__.py +++ b/nova/tests/api/ec2/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/api/openstack/__init__.py b/nova/tests/api/openstack/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/api/openstack/__init__.py +++ b/nova/tests/api/openstack/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/api/openstack/compute/__init__.py b/nova/tests/api/openstack/compute/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/api/openstack/compute/__init__.py +++ b/nova/tests/api/openstack/compute/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/api/openstack/compute/contrib/__init__.py b/nova/tests/api/openstack/compute/contrib/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/api/openstack/compute/contrib/__init__.py +++ b/nova/tests/api/openstack/compute/contrib/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/cells/__init__.py b/nova/tests/cells/__init__.py index d1bf725f78..22dfdf45f9 100644 --- a/nova/tests/cells/__init__.py +++ b/nova/tests/cells/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/cert/__init__.py b/nova/tests/cert/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/cert/__init__.py +++ b/nova/tests/cert/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/compute/__init__.py b/nova/tests/compute/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/compute/__init__.py +++ b/nova/tests/compute/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/console/__init__.py b/nova/tests/console/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/console/__init__.py +++ b/nova/tests/console/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/consoleauth/__init__.py b/nova/tests/consoleauth/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/consoleauth/__init__.py +++ b/nova/tests/consoleauth/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/image/__init__.py b/nova/tests/image/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/image/__init__.py +++ b/nova/tests/image/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/integrated/__init__.py b/nova/tests/integrated/__init__.py index 430af87544..10e0a91d77 100644 --- a/nova/tests/integrated/__init__.py +++ b/nova/tests/integrated/__init__.py @@ -18,5 +18,3 @@ :mod:`integrated` -- Tests whole systems, using mock services where needed ================================= """ -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/network/__init__.py b/nova/tests/network/__init__.py index 34c7255d3a..0b3d2db5e9 100644 --- a/nova/tests/network/__init__.py +++ b/nova/tests/network/__init__.py @@ -14,4 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from nova.tests import * diff --git a/nova/tests/scheduler/__init__.py b/nova/tests/scheduler/__init__.py index 4c506c9faa..4dec227c40 100644 --- a/nova/tests/scheduler/__init__.py +++ b/nova/tests/scheduler/__init__.py @@ -14,6 +14,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from nova.tests import * diff --git a/nova/tests/virt/baremetal/__init__.py b/nova/tests/virt/baremetal/__init__.py index 34b09daac9..19071662cc 100644 --- a/nova/tests/virt/baremetal/__init__.py +++ b/nova/tests/virt/baremetal/__init__.py @@ -12,4 +12,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from nova.tests.virt.baremetal import * diff --git a/nova/tests/virt/baremetal/db/__init__.py b/nova/tests/virt/baremetal/db/__init__.py index 0f1f4e8468..19071662cc 100644 --- a/nova/tests/virt/baremetal/db/__init__.py +++ b/nova/tests/virt/baremetal/db/__init__.py @@ -12,4 +12,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from nova.tests.virt.baremetal.db import * diff --git a/nova/virt/baremetal/db/__init__.py b/nova/virt/baremetal/db/__init__.py index ad883f505c..038ec445d3 100644 --- a/nova/virt/baremetal/db/__init__.py +++ b/nova/virt/baremetal/db/__init__.py @@ -13,4 +13,4 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.virt.baremetal.db.api import * +from nova.virt.baremetal.db.api import * # noqa diff --git a/smoketests/flags.py b/smoketests/flags.py index 5f3c8505e5..472e764090 100644 --- a/smoketests/flags.py +++ b/smoketests/flags.py @@ -22,7 +22,7 @@ where they're used. """ -from gflags import * +from gflags import * # noqa # This keeps pylint from barfing on the imports FLAGS = FLAGS diff --git a/tox.ini b/tox.ini index 4bbc1d03b5..5322b61286 100644 --- a/tox.ini +++ b/tox.ini @@ -45,7 +45,7 @@ commands = {posargs} # H102 Apache 2.0 license header not found # H501 Do not use locals() for string formatting -ignore = E121,E122,E123,E124,E126,E127,E128,E711,E712,H102,H302,H303,H404,F403,H501,F811,F841,N309 +ignore = E121,E122,E123,E124,E126,E127,E128,E711,E712,H102,H302,H404,F403,H501,F811,F841,N309 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*plugins/xenserver*,tools [hacking]