Merge lp:~jr/bzr-explorer/781204-fix-deprecated-usage into lp:bzr-explorer

[Jonathan Riddell]

Use cmdline.split() instead

[Martin Pool (mbp)]

review: Approve

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 6/3/2011 5:41 PM, Jonathan Riddell wrote:
> Jonathan Riddell has proposed merging lp:~jr/bzr-explorer/781204-fix-deprecated-usage into lp:bzr-explorer.
>
> Requested reviews:
> Bazaar Explorer Developers (bzr-explorer-dev)
> Related bugs:
> Bug #781204 in Bazaar Explorer: "deprecated API usage"
> https://bugs.launchpad.net/bzr-explorer/+bug/781204
>
> For more details, see:
> https://code.launchpad.net/~jr/bzr-explorer/781204-fix-deprecated-usage/+merge/63398
>
> Use cmdline.split() instead
>

Is there a version compatibility concern here? I'm not positive, but it
looks like these sort of commands showed up around 2.1/2.2. Which could
be old enough qbzr doesn't care.

The changes are certainly good vs bzr trunk.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3s4WsACgkQJdeBCYSNAANlKQCgvpMY/XqvPf8y9irepPLDg5oH
Z0EAnA92lw5RMSx9mgQcuu16M8yaoZ9K
=Uwue
-----END PGP SIGNATURE-----

[Jeffrey Glenn (jeff-f)]

Thank you for your solution and diff. That is what I needed to fix my error (as described in Bug #1114680):

bzr: ERROR: exceptions.ImportError: cannot import name shlex_split_unicode

=== modified file 'lib/app_suite.py'
--- lib/app_suite.py	2010-08-09 18:56:20 +0000
+++ lib/app_suite.py	2011-06-03 15:41:16 +0000
@@ -33,7 +33,7 @@
 """
 
 from bzrlib import registry
-from bzrlib.commands import shlex_split_unicode
+from bzrlib.cmdline import split
 
 
 _PERMITTED_PLACEHOLDERS = [
@@ -147,7 +147,7 @@
 
 def command_to_args(template, context):
     """Convert a command template and context to a list of arguments."""
-    return shlex_split_unicode(command_to_expanded(template, context))
+    return split(command_to_expanded(template, context))
 
 
 # The registry of suites

=== modified file 'lib/explorer.py'
--- lib/explorer.py	2011-05-10 13:14:41 +0000
+++ lib/explorer.py	2011-06-03 15:41:16 +0000
@@ -27,7 +27,7 @@
     trace,
     urlutils,
     )
-from bzrlib.commands import shlex_split_unicode
+from bzrlib.cmdline import split
 from bzrlib.plugins import explorer
 from bzrlib.plugins.explorer.lib import (
     accessories_dialog,
@@ -119,7 +119,7 @@
         # Map xx.app -> "open -a /Applications/xx.app"
         if command.endswith(".app") and not command.startswith("open"):
             command = 'open -a "%s"' % command
-    return shlex_split_unicode(command)
+    return split(command)
 
 
 class QExplorerMainWindow(QBzrWindow):