codetree

Merge lp:~techalchemy/codetree/fix-encoding into lp:codetree

  1. fix-encoding
  2. Merge into trunk
Proposed by Dan Ryan
Status: Merged
Approved by: Stuart Bishop
Approved revision: 107
Merged at revision: 107
Proposed branch: lp:~techalchemy/codetree/fix-encoding
Merge into: lp:codetree
Diff against target: 20 lines (+2/-1)
1 file modified
codetree/config.py (+2/-1)
To merge this branch: bzr merge lp:~techalchemy/codetree/fix-encoding
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Canonical IS Reviewers Pending
Review via email: mp+378783@code.launchpad.net

Commit message

fixes bug: https://launchpad.net/bugs/1862581

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

lp:~techalchemy/codetree/fix-encoding updated
107. By Dan Ryan

Fix yaml encoding on python 2.7

Revision history for this message
Stuart Bishop (stub) wrote :

Yup, ta.

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 107

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'codetree/config.py'
2--- codetree/config.py 2020-01-30 22:08:26 +0000
3+++ codetree/config.py 2020-02-10 05:11:52 +0000
4@@ -7,6 +7,7 @@
5 import yaml
6
7 import concurrent.futures
8+import six
9 from six.moves.urllib.parse import urlparse
10 from hashlib import sha256
11
12@@ -87,7 +88,7 @@
13 collect_info = self.collect_info(result)
14 if collect_info and os.path.isdir(self.location):
15 with open(collect_info_path, 'w') as f:
16- f.write(yaml.dump(collect_info, default_flow_style=False))
17+ f.write(six.ensure_text(yaml.dump(collect_info, default_flow_style=False)))
18 return result
19
20 def __repr__(self):

Subscribers

People subscribed via source and target branches

to all changes: