← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-27 14:28:26 UTC
  • mfrom: (6171.2.1 860424-hidden-options)
  • Revision ID: pqm@pqm.ubuntu.com-20110927142826-blyyexoowqf509er
(vila) Clarify how a global option can be hidden by a command ('log' hides
 'message') (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
816
816
    try:
817
817
        options, args = parser.parse_args(args)
818
818
    except UnicodeEncodeError,e:
819
 
        raise errors.BzrCommandError(gettext('Only ASCII permitted in option names'))
 
819
        raise errors.BzrCommandError(
 
820
            gettext('Only ASCII permitted in option names'))
820
821
 
821
822
    opts = dict([(k, v) for k, v in options.__dict__.iteritems() if
822
823
                 v is not option.OptionParser.DEFAULT_VALUE])