launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-lpserve-unicode into launchpad:master.

Commit message:
Use six.text_type rather than unicode in lpserve

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/391262
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-lpserve-unicode into launchpad:master.

diff --git a/brzplugins/lpserve/__init__.py b/brzplugins/lpserve/__init__.py
index 15a1b04..7dc00c7 100644
--- a/brzplugins/lpserve/__init__.py
+++ b/brzplugins/lpserve/__init__.py
@@ -57,7 +57,7 @@ class cmd_launchpad_server(Command):
             help=(
                 "upload branches to this directory. Defaults to "
                 "config.codehosting.hosted_branches_root."),
-            type=unicode),
+            type=six.text_type),
         Option(
             'mirror-directory',
             help=(
@@ -68,7 +68,7 @@ class cmd_launchpad_server(Command):
             help=(
                 "the url of the internal XML-RPC server. Defaults to "
                 "config.codehosting.codehosting_endpoint."),
-            type=unicode),
+            type=six.text_type),
         RegistryOption(
             'protocol', help="Protocol to serve.",
             lazy_registry=('breezy.transport', 'transport_server_registry'),