Merge ~cjwatson/launchpad:py3-list-team-members into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: dcad6e067dbbda5b6c29ec0e0935b2c2f13efd92
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-list-team-members
Merge into: launchpad:master
Diff against target: 47 lines (+8/-6)
2 files modified
lib/lp/registry/scripts/listteammembers.py (+1/-1)
scripts/list-team-members (+7/-5)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+397326@code.launchpad.net

Commit message

Port list-team-members to Python 3

Description of the change

We can handle Unicode issues in the wrapper script, rather than artificially replacing non-ASCII characters in display names.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/lib/lp/registry/scripts/listteammembers.py b/lib/lp/registry/scripts/listteammembers.py
index 058ca8c..f9631c3 100644
--- a/lib/lp/registry/scripts/listteammembers.py
+++ b/lib/lp/registry/scripts/listteammembers.py
@@ -72,7 +72,7 @@ def process_team(teamname, display_option='simple'):
72 name=member.name,72 name=member.name,
73 teamname=teamname,73 teamname=teamname,
74 id=member.id,74 id=member.id,
75 displayname=member.displayname.encode("ascii", "replace"),75 displayname=member.displayname,
76 ubuntite=ubuntite,76 ubuntite=ubuntite,
77 sshkey=sshkey,77 sshkey=sshkey,
78 )78 )
diff --git a/scripts/list-team-members b/scripts/list-team-members
index 99b75ca..fcc8948 100755
--- a/scripts/list-team-members
+++ b/scripts/list-team-members
@@ -10,12 +10,12 @@ import _pythonpath
10import logging10import logging
11import sys11import sys
1212
13import six
14
13from lp.registry.scripts.listteammembers import (15from lp.registry.scripts.listteammembers import (
14 NoSuchTeamError,16 NoSuchTeamError,
15 process_team,17 process_team,
16 )18 )
17from lp.services.config import config
18from lp.services.scripts import execute_zcml_for_scripts
19from lp.services.scripts.base import (19from lp.services.scripts.base import (
20 LaunchpadScript,20 LaunchpadScript,
21 LaunchpadScriptFailure,21 LaunchpadScriptFailure,
@@ -56,9 +56,11 @@ class ListTeamMembersScript(LaunchpadScript):
56 member_details.update(process_team(teamname, display_option))56 member_details.update(process_team(teamname, display_option))
57 except NoSuchTeamError:57 except NoSuchTeamError:
58 raise LaunchpadScriptFailure("No such team: %s" % teamname)58 raise LaunchpadScriptFailure("No such team: %s" % teamname)
59 print "\n".join(detail.encode('utf-8') for detail in59 for detail in sorted(member_details):
60 sorted(member_details))60 print(six.ensure_str(detail))
61
6162
62if __name__ == '__main__':63if __name__ == '__main__':
63 script = ListTeamMembersScript('lp.services.scripts.listteammembers', dbuser='listteammembers')64 script = ListTeamMembersScript(
65 'lp.services.scripts.listteammembers', dbuser='listteammembers')
64 script.run()66 script.run()

Subscribers

People subscribed via source and target branches

to status/vote changes: