Browse Source

Remove 'u' prefix

In Python 3, u'...' and '...' are equivalent. Also, the prefix is no
longer printed.

Change-Id: I3de64b2526422322ad10231d9d682a326d4435ca
changes/50/842250/1
Takashi Kajinami 3 months ago
parent
commit
b2a35f13d5
  1. 16
      releasenotes/source/conf.py
  2. 36
      scripts/check-run-nova-compute
  3. 18
      tripleo_heat_templates/environment_generator.py

16
releasenotes/source/conf.py

@ -44,8 +44,8 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
project = u'tripleo-heat-templates Release Notes'
copyright = u'2017, TripleO Developers'
project = 'tripleo-heat-templates Release Notes'
copyright = '2017, TripleO Developers'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@ -199,8 +199,8 @@ latex_elements = {
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'tripleo-heat-templatesReleaseNotes.tex', u'tripleo-heat-templates Release Notes Documentation',
u'2016, TripleO Developers', 'manual'),
('index', 'tripleo-heat-templatesReleaseNotes.tex', 'tripleo-heat-templates Release Notes Documentation',
'2016, TripleO Developers', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
@ -229,8 +229,8 @@ latex_documents = [
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'tripleo-heat-templatesreleasenotes', u'tripleo-heat-templates Release Notes Documentation',
[u'2016, TripleO Developers'], 1)
('index', 'tripleo-heat-templatesreleasenotes', 'tripleo-heat-templates Release Notes Documentation',
['2016, TripleO Developers'], 1)
]
# If true, show URL addresses after external links.
@ -243,8 +243,8 @@ man_pages = [
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'tripleo-heat-templatesReleaseNotes', u'tripleo-heat-templates Release Notes Documentation',
u'2016, TripleO Developers', 'tripleo-heat-templatesReleaseNotes', 'One line description of project.',
('index', 'tripleo-heat-templatesReleaseNotes', 'tripleo-heat-templates Release Notes Documentation',
'2016, TripleO Developers', 'tripleo-heat-templatesReleaseNotes', 'One line description of project.',
'Miscellaneous'),
]

36
scripts/check-run-nova-compute

@ -29,24 +29,24 @@ def evacuations_done(connection, hostname):
# print migration.to_dict()
#
# {
# u'status': u'error',
# u'dest_host': None,
# u'new_instance_type_id': 2,
# u'old_instance_type_id': 2,
# u'updated_at': u'2018-04-22T20:55:29.000000',
# u'dest_compute':
# u'overcloud-novacompute-2.localdomain',
# u'migration_type': u'live-migration',
# u'source_node':
# u'overcloud-novacompute-0.localdomain',
# u'id': 8,
# u'created_at': u'2018-04-22T20:52:58.000000',
# u'instance_uuid':
# u'd1c82ce8-3dc5-48db-b59f-854b3b984ef1',
# u'dest_node':
# u'overcloud-novacompute-2.localdomain',
# u'source_compute':
# u'overcloud-novacompute-0.localdomain'
# 'status': 'error',
# 'dest_host': None,
# 'new_instance_type_id': 2,
# 'old_instance_type_id': 2,
# 'updated_at': '2018-04-22T20:55:29.000000',
# 'dest_compute':
# 'overcloud-novacompute-2.localdomain',
# 'migration_type': 'live-migration',
# 'source_node':
# 'overcloud-novacompute-0.localdomain',
# 'id': 8,
# 'created_at': '2018-04-22T20:52:58.000000',
# 'instance_uuid':
# 'd1c82ce8-3dc5-48db-b59f-854b3b984ef1',
# 'dest_node':
# 'overcloud-novacompute-2.localdomain',
# 'source_compute':
# 'overcloud-novacompute-0.localdomain'
# }
# Acceptable: done, completed, failed
if migration.status in ["running", "accepted", "pre-migrating"]:

18
tripleo_heat_templates/environment_generator.py

@ -177,31 +177,31 @@ def _generate_environment(input_env, output_path, parent_env=None):
# the environment itself, uncomment these entries and make them
# top-level keys in the YAML.
env_title = env.get('title', '')
env_file.write(u'# title: %s\n' % env_title)
env_file.write('# title: %s\n' % env_title)
env_desc = env.get('description', '')
env_file.write(u'# description: |\n')
env_file.write('# description: |\n')
for line in env_desc.splitlines():
if line:
env_file.write(u'# %s\n' % line)
env_file.write('# %s\n' % line)
else:
env_file.write('#\n')
if parameter_defaults or static_defaults:
env_file.write(u'parameter_defaults:\n')
env_file.write('parameter_defaults:\n')
write_params_entry(env_file, parameter_defaults[_PARAMETERS],
static_defaults[_PARAMETERS], 0)
param_names.pop(_PARAMETERS, None)
for name in param_names:
env_file.write(u' %s:\n' % name)
env_file.write(' %s:\n' % name)
write_params_entry(env_file, parameter_defaults[name],
static_defaults[name], 2)
if env.get('resource_registry'):
env_file.write(u'resource_registry:\n')
env_file.write('resource_registry:\n')
for res, value in sorted(env.get('resource_registry', {}).items()):
env_file.write(u' %s: %s\n' % (res, value))
env_file.write(' %s: %s\n' % (res, value))
if env.get('parameter_merge_strategies'):
env_file.write(u'parameter_merge_strategies:\n')
env_file.write('parameter_merge_strategies:\n')
for res, value in sorted(env.get('parameter_merge_strategies', {}).items()):
env_file.write(u' %s: %s\n' % (res, value))
env_file.write(' %s: %s\n' % (res, value))
print('Wrote sample environment "%s"' % target_file)
for e in env.get('children', []):

Loading…
Cancel
Save