Launchpad itself

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

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-list-team-members
  4. Merge into 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
1diff --git a/lib/lp/registry/scripts/listteammembers.py b/lib/lp/registry/scripts/listteammembers.py
2index 058ca8c..f9631c3 100644
3--- a/lib/lp/registry/scripts/listteammembers.py
4+++ b/lib/lp/registry/scripts/listteammembers.py
5@@ -72,7 +72,7 @@ def process_team(teamname, display_option='simple'):
6 name=member.name,
7 teamname=teamname,
8 id=member.id,
9- displayname=member.displayname.encode("ascii", "replace"),
10+ displayname=member.displayname,
11 ubuntite=ubuntite,
12 sshkey=sshkey,
13 )
14diff --git a/scripts/list-team-members b/scripts/list-team-members
15index 99b75ca..fcc8948 100755
16--- a/scripts/list-team-members
17+++ b/scripts/list-team-members
18@@ -10,12 +10,12 @@ import _pythonpath
19 import logging
20 import sys
21
22+import six
23+
24 from lp.registry.scripts.listteammembers import (
25 NoSuchTeamError,
26 process_team,
27 )
28-from lp.services.config import config
29-from lp.services.scripts import execute_zcml_for_scripts
30 from lp.services.scripts.base import (
31 LaunchpadScript,
32 LaunchpadScriptFailure,
33@@ -56,9 +56,11 @@ class ListTeamMembersScript(LaunchpadScript):
34 member_details.update(process_team(teamname, display_option))
35 except NoSuchTeamError:
36 raise LaunchpadScriptFailure("No such team: %s" % teamname)
37- print "\n".join(detail.encode('utf-8') for detail in
38- sorted(member_details))
39+ for detail in sorted(member_details):
40+ print(six.ensure_str(detail))
41+
42
43 if __name__ == '__main__':
44- script = ListTeamMembersScript('lp.services.scripts.listteammembers', dbuser='listteammembers')
45+ script = ListTeamMembersScript(
46+ 'lp.services.scripts.listteammembers', dbuser='listteammembers')
47 script.run()

Subscribers

People subscribed via source and target branches

to status/vote changes: