From e07d7692701bcb976da9b3db637dd690496f38fd Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Thu, 5 Jan 2017 16:50:25 -0600 Subject: [PATCH] Clean-up for tox -epy35 errors Py35 does allow for the loading of modules in the same folder without specifying the patch. Updated import to use absolute pathing. This patch set also remove `# noqa` in EOF import statements. Those should be addressed in future patch set that do PEP8 clean up. --- .gitignore | 3 ++- valet/api/db/models/music/__init__.py | 8 ++++---- valet/engine/optimizer/ostro/openstack_filters.py | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c9aba86..9a9a4ef 100644 --- a/.gitignore +++ b/.gitignore @@ -42,9 +42,10 @@ var/ .eggs/ .installed.cfg *.egg +.python-version # PyInstaller -# Usually these files are written by a python script from a template +# Usually these files are written by a python script from a template # before PyInstaller builds the exe, so as to inject date/other infos into it. *.manifest *.spec diff --git a/valet/api/db/models/music/__init__.py b/valet/api/db/models/music/__init__.py index 75419dd..4c17a11 100644 --- a/valet/api/db/models/music/__init__.py +++ b/valet/api/db/models/music/__init__.py @@ -297,7 +297,7 @@ def flush(): pass -from groups import Group # noqa -from ostro import PlacementRequest, PlacementResult, Event # noqa -from placements import Placement # noqa -from plans import Plan # noqa +from valet.api.db.models.music.groups import Group +from valet.api.db.models.music.ostro import PlacementRequest, PlacementResult, Event +from valet.api.db.models.music.placements import Placement +from valet.api.db.models.music.plans import Plan diff --git a/valet/engine/optimizer/ostro/openstack_filters.py b/valet/engine/optimizer/ostro/openstack_filters.py index e7ef680..663458d 100755 --- a/valet/engine/optimizer/ostro/openstack_filters.py +++ b/valet/engine/optimizer/ostro/openstack_filters.py @@ -11,11 +11,10 @@ # under the License. # Modified: Mar. 15, 2016 - -import openstack_utils import six from valet.engine.optimizer.app_manager.app_topology_base import VM +import valet.engine.optimizer.ostro.openstack_utils _SCOPE = 'aggregate_instance_extra_specs'