Bazaar

Merge lp:~doxxx/bzr/524181-shlex_split_unicode into lp:bzr

  1. 524181-shlex_split_unicode
  2. Merge into bzr.dev
Proposed by Gordon Tyler
Status: Merged
Approved by: Ian Clatworthy
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~doxxx/bzr/524181-shlex_split_unicode
Merge into: lp:bzr
Diff against target: 14 lines (+5/-0)
1 file modified
bzrlib/commands.py (+5/-0)
To merge this branch: bzr merge lp:~doxxx/bzr/524181-shlex_split_unicode
Reviewer Review Type Date Requested Status
Martin Pool Approve
Ian Clatworthy Approve
Review via email: mp+19675@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gordon Tyler (doxxx) wrote :

Fixes bug 524181 by restoring shlex_split_unicode but implementing it using cmdline.split().

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Works for me. Thanks.

review: Approve
Revision history for this message
Martin Pool (mbp) :
review: Approve
Revision history for this message
Gordon Tyler (doxxx) wrote :

Does this need further review?

Revision history for this message
Martin Pool (mbp) wrote :

No, just needs merging.

Revision history for this message
Gordon Tyler (doxxx) wrote :

I added a deprecated_method annotation to shlex_split_unicode.

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

I'll go ahead and merge this without the deprecated_method line, i.e. rev 5051. I don't feel it worth deprecating it at this point. Also, it needs to be deprecated_function (not method) if we decide to deprecate it later. :-)

Revision history for this message
Vincent Ladeuil (vila) wrote :

I'll add a test and deprecate with @deprecate_function.

Leaving deprecated functions around *without* really deprecating them has proved to be a pain point in the past.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/commands.py'
2--- bzrlib/commands.py 2010-02-21 07:28:47 +0000
3+++ bzrlib/commands.py 2010-02-23 01:55:25 +0000
4@@ -875,6 +875,11 @@
5 return ret
6
7
8+@deprecated_method(deprecated_in((2, 2, 0)))
9+def shlex_split_unicode(unsplit):
10+ return cmdline.split(unsplit)
11+
12+
13 def get_alias(cmd, config=None):
14 """Return an expanded alias, or None if no alias exists.
15