launchpad-reviewers team mailing list archive

[Colin Watson <mp+406660@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3only-shlex-quote into launchpad:master.

Commit message:
Drop fallback from shlex.quote to pipes.quote

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/406660
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3only-shlex-quote into launchpad:master.

diff --git a/lib/lp/archivepublisher/run_parts.py b/lib/lp/archivepublisher/run_parts.py
index 21b5569..cd70f38 100644
--- a/lib/lp/archivepublisher/run_parts.py
+++ b/lib/lp/archivepublisher/run_parts.py
@@ -11,10 +11,7 @@ __all__ = [
     ]
 
 import os
-try:
-    from shlex import quote as shell_quote
-except ImportError:
-    from pipes import quote as shell_quote
+from shlex import quote as shell_quote
 import subprocess
 
 from lp.services.config import config
diff --git a/lib/lp/codehosting/scripts/sync_branches.py b/lib/lp/codehosting/scripts/sync_branches.py
index 004c8b1..c094760 100644
--- a/lib/lp/codehosting/scripts/sync_branches.py
+++ b/lib/lp/codehosting/scripts/sync_branches.py
@@ -7,10 +7,7 @@ __metaclass__ = type
 __all__ = ['SyncBranchesScript']
 
 import os.path
-try:
-    from shlex import quote as shell_quote
-except ImportError:
-    from pipes import quote as shell_quote
+from shlex import quote as shell_quote
 import subprocess
 
 from zope.component import getUtility
diff --git a/lib/lp/scripts/utilities/importpedant.py b/lib/lp/scripts/utilities/importpedant.py
index 160af05..71e636c 100644
--- a/lib/lp/scripts/utilities/importpedant.py
+++ b/lib/lp/scripts/utilities/importpedant.py
@@ -27,10 +27,6 @@ valid_imports_not_in_all = {
     'importlib': set(['resources']),
     'openid.fetchers': set(['Urllib2Fetcher']),
     'openid.message': set(['NamespaceAliasRegistrationError']),
-    # Exported as shlex.quote in Python 3.
-    'pipes': set(['quote']),
-    # Exported in Python 3, but missing and so not exported in Python 2.
-    'shlex': set(['quote']),
     'six.moves.http_cookiejar': set(['domain_match']),
     'storm.database': set(['STATE_DISCONNECTED']),
     'talisker': set(['run_gunicorn']),