Merge lp://qastaging/~elopio/snapcraft/fix1477638-format_strings1 into lp://qastaging/~snappy-dev/snapcraft/core

Proposed by Leo Arias
Status: Merged
Approved by: Michael Terry
Approved revision: 113
Merged at revision: 111
Proposed branch: lp://qastaging/~elopio/snapcraft/fix1477638-format_strings1
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Prerequisite: lp://qastaging/~elopio/snapcraft/fix1476452-python_log
Diff against target: 363 lines (+107/-37)
8 files modified
snapcraft/cmds.py (+19/-16)
snapcraft/common.py (+20/-5)
snapcraft/dirs.py (+3/-3)
snapcraft/plugin.py (+9/-7)
snapcraft/tests/__init__.py (+8/-3)
snapcraft/tests/test_common.py (+42/-0)
snapcraft/tests/test_yaml.py (+3/-0)
snapcraft/yaml.py (+3/-3)
To merge this branch: bzr merge lp://qastaging/~elopio/snapcraft/fix1477638-format_strings1
Reviewer Review Type Date Requested Status
Michael Terry (community) Approve
Review via email: mp+265703@code.qastaging.launchpad.net

Commit message

Cleanups to prepare for changing the format strings safely.

Description of the change

I was going to replace the % with format, but found some things that made it hard because the values in common depend on when they are imported and it's not clear what is changing those values. So I made set and get functions, and use CAPS to make it clear what is constant and what is not.

To post a comment you must log in.
111. By Leo Arias

Add the missing file.

112. By Leo Arias

Moved the plugindir cleanup to the base test case.

113. By Leo Arias

Fixed the imports.

Revision history for this message
Michael Terry (mterry) wrote :

Code looks fine, but now you have a conflict with trunk.

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote :

nm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: