openstack
/
murano
Code Issues Proposed changes

Fix pep8 E402 

Change-Id: Ie8eda174a6da50a222e4070a18a421eff28b6119
This commit is contained in:
zhurong 2019-01-09 13:23:29 +08:00
parent c023d63562
commit 20af772ee7
20 changed files with 77 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-ref/source/conf.py
View File

@ -27,6 +27,8 @@
import os import os
import sys import sys
from murano.version import version_info
extensions = [ extensions = [
'os_api_ref', 'os_api_ref',
'openstackdocstheme' 'openstackdocstheme'
@ -74,7 +76,6 @@ copyright = u'2016-present, OpenStack Foundation'
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
# built documents. # built documents.
# #
from murano.version import version_info
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version_info.release_string() release = version_info.release_string()
# The short X.Y version. # The short X.Y version.

18
murano/cmd/api.py
View File

@ -16,19 +16,10 @@
import os import os
import sys
import eventlet import eventlet
if os.name == 'nt':
# eventlet monkey patching causes subprocess.Popen to fail on Windows
# when using pipes due to missing non blocking I/O support
eventlet.monkey_patch(os=False)
else:
eventlet.monkey_patch()
import sys
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
@ -45,6 +36,13 @@ from murano.common import wsgi
CONF = cfg.CONF CONF = cfg.CONF
if os.name == 'nt':
# eventlet monkey patching causes subprocess.Popen to fail on Windows
# when using pipes due to missing non blocking I/O support
eventlet.monkey_patch(os=False)
else:
eventlet.monkey_patch()
# If ../murano/__init__.py exists, add ../ to Python search path, so that # If ../murano/__init__.py exists, add ../ to Python search path, so that
# it will override what happens to be installed in /usr/(local/)lib/python... # it will override what happens to be installed in /usr/(local/)lib/python...
root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)

19
murano/cmd/cfapi.py
View File

@ -14,21 +14,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import os import os
import sys
import eventlet import eventlet
if os.name == 'nt':
# eventlet monkey patching causes subprocess.Popen to fail on Windows
# when using pipes due to missing non blocking I/O support
eventlet.monkey_patch(os=False)
else:
eventlet.monkey_patch()
import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_service import service from oslo_service import service
@ -42,6 +32,13 @@ from murano.common import wsgi
CONF = cfg.CONF CONF = cfg.CONF
if os.name == 'nt':
# eventlet monkey patching causes subprocess.Popen to fail on Windows
# when using pipes due to missing non blocking I/O support
eventlet.monkey_patch(os=False)
else:
eventlet.monkey_patch()
# If ../murano/__init__.py exists, add ../ to Python search path, so that # If ../murano/__init__.py exists, add ../ to Python search path, so that
# it will override what happens to be installed in /usr/(local/)lib/python... # it will override what happens to be installed in /usr/(local/)lib/python...
root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)

18
murano/cmd/engine.py
View File

@ -15,19 +15,10 @@
# under the License. # under the License.
import os import os
import sys
import eventlet import eventlet
if os.name == 'nt':
# eventlet monkey patching causes subprocess.Popen to fail on Windows
# when using pipes due to missing non blocking I/O support
eventlet.monkey_patch(os=False)
else:
eventlet.monkey_patch()
import sys
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_log import log as logging from oslo_log import log as logging
from oslo_service import service from oslo_service import service
@ -38,6 +29,13 @@ from murano.common import engine
CONF = config.CONF CONF = config.CONF
if os.name == 'nt':
# eventlet monkey patching causes subprocess.Popen to fail on Windows
# when using pipes due to missing non blocking I/O support
eventlet.monkey_patch(os=False)
else:
eventlet.monkey_patch()
# If ../murano/__init__.py exists, add ../ to Python search path, so that # If ../murano/__init__.py exists, add ../ to Python search path, so that
# it will override what happens to be installed in /usr/(local/)lib/python... # it will override what happens to be installed in /usr/(local/)lib/python...
root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)

7
murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py
View File

@ -18,13 +18,12 @@ Create Date: 2016-03-30 16:34:33.698760
""" """
# revision identifiers, used by Alembic.
revision = '001'
down_revision = None
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '001'
down_revision = None
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

8
murano/db/migration/alembic_migrations/versions/001_initial_version.py
View File

@ -18,11 +18,6 @@ Revises: None
Create Date: 2014-05-29 16:32:33.698760 Create Date: 2014-05-29 16:32:33.698760
""" """
# revision identifiers, used by Alembic.
revision = '001'
down_revision = None
import uuid import uuid
from alembic import op from alembic import op
@ -33,6 +28,9 @@ from sqlalchemy.sql.expression import table as sa_table
from murano.common import consts from murano.common import consts
from murano.db.sqla import types as st from murano.db.sqla import types as st
# revision identifiers, used by Alembic.
revision = '001'
down_revision = None
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

6
murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py
View File

@ -18,15 +18,13 @@ Revises: None
Create Date: 2014-06-23 16:34:33.698760 Create Date: 2014-06-23 16:34:33.698760
""" """
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '002' revision = '002'
down_revision = '001' down_revision = '001'
from alembic import op
import sqlalchemy as sa
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

9
murano/db/migration/alembic_migrations/versions/003_add_action_entry.py
View File

@ -19,16 +19,15 @@ Revises: table deployment
Create Date: 2014-07-30 16:11:33.244 Create Date: 2014-07-30 16:11:33.244
""" """
# revision identifiers, used by Alembic.
revision = '003'
down_revision = '002'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
import murano.db.migration.helpers as helpers import murano.db.migration.helpers as helpers
# revision identifiers, used by Alembic.
revision = '003'
down_revision = '002'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

9
murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py
View File

@ -18,17 +18,16 @@ Revision ID: 004
Revises: table package Revises: table package
""" """
# revision identifiers, used by Alembic.
revision = '004'
down_revision = '003'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
import murano.db.migration.helpers as helpers import murano.db.migration.helpers as helpers
from murano.db.sqla import types as st from murano.db.sqla import types as st
# revision identifiers, used by Alembic.
revision = '004'
down_revision = '003'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

6
murano/db/migration/alembic_migrations/versions/005_environment-template.py
View File

@ -19,15 +19,13 @@ Revision ID: 005
Revises: table template Revises: table template
""" """
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '005' revision = '005'
down_revision = '004' down_revision = '004'
from alembic import op
import sqlalchemy as sa
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

6
murano/db/migration/alembic_migrations/versions/006_add_task_result.py
View File

@ -18,15 +18,13 @@ Revises: None
Create Date: 2015-02-15 12:14:12 Create Date: 2015-02-15 12:14:12
""" """
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '006' revision = '006'
down_revision = '005' down_revision = '005'
from alembic import op
import sqlalchemy as sa
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

7
murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py
View File

@ -18,13 +18,12 @@ Create Date: 2015-08-17 16:34:33.698760
""" """
# revision identifiers, used by Alembic.
revision = '009'
down_revision = '008'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '009'
down_revision = '008'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

7
murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py
View File

@ -18,13 +18,12 @@ Create Date: 2015-09-08 00:00:00.698760
""" """
# revision identifiers, used by Alembic.
revision = '010'
down_revision = '009'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '010'
down_revision = '009'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

7
murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py
View File

@ -20,13 +20,12 @@ Revises: table template
""" """
# revision identifiers, used by Alembic.
revision = '011'
down_revision = '010'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '011'
down_revision = '010'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

7
murano/db/migration/alembic_migrations/versions/012_support_domain_users.py
View File

@ -20,13 +20,12 @@ Revises: table session, table package
""" """
# revision identifiers, used by Alembic.
revision = '012'
down_revision = '011'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '012'
down_revision = '011'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

8
murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py
View File

@ -21,14 +21,14 @@ Create Date: 2016-04-12 15:46:12.251155
""" """
# revision identifiers, used by Alembic.
revision = '013'
down_revision = '012'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
import sqlalchemy.dialects.mysql as sa_mysql import sqlalchemy.dialects.mysql as sa_mysql
# revision identifiers, used by Alembic.
revision = '013'
down_revision = '012'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

6
murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py
View File

@ -20,13 +20,13 @@ Create Date: 2016-04-28
""" """
from alembic import op
import sqlalchemy.dialects.mysql as sa_mysql
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '014' revision = '014'
down_revision = '013' down_revision = '013'
from alembic import op
import sqlalchemy.dialects.mysql as sa_mysql
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

7
murano/db/migration/alembic_migrations/versions/015_adding_text_description.py
View File

@ -20,13 +20,12 @@ Create Date: 2016-06-17
""" """
# revision identifiers, used by Alembic.
revision = '015'
down_revision = '014'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '015'
down_revision = '014'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

8
murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py
View File

@ -21,14 +21,14 @@ Create Date: 2016-08-30 10:45:00
""" """
# revision identifiers, used by Alembic.
revision = '016'
down_revision = '015'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
import sqlalchemy.dialects.mysql as sa_mysql import sqlalchemy.dialects.mysql as sa_mysql
# revision identifiers, used by Alembic.
revision = '016'
down_revision = '015'
MYSQL_ENGINE = 'InnoDB' MYSQL_ENGINE = 'InnoDB'
MYSQL_CHARSET = 'utf8' MYSQL_CHARSET = 'utf8'

10
murano/opts.py
View File

@ -12,11 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
__all__ = [
'list_opts',
'list_cfapi_opts',
]
import copy import copy
import itertools import itertools
from keystoneauth1 import loading as ks_loading from keystoneauth1 import loading as ks_loading
@ -27,6 +22,11 @@ import murano.common.cf_config
import murano.common.config import murano.common.config
import murano.common.wsgi import murano.common.wsgi
__all__ = [
'list_opts',
'list_cfapi_opts',
]
def build_list(opt_list): def build_list(opt_list):
return list(itertools.chain(*opt_list)) return list(itertools.chain(*opt_list))