← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-29 15:50:58 UTC
  • mfrom: (6177 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6178.
  • Revision ID: v.ladeuil+lp@free.fr-20110929155058-zgbecmx1huzktegm
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

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