← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
312
312
 
313
313
    def __init__(self, name, help, registry=None, converter=None,
314
314
        value_switches=False, title=None, enum_switch=True,
315
 
        lazy_registry=None):
 
315
        lazy_registry=None, short_name=None):
316
316
        """
317
317
        Constructor.
318
318
 
329
329
        :param lazy_registry: A tuple of (module name, attribute name) for a
330
330
            registry to be lazily loaded.
331
331
        """
332
 
        Option.__init__(self, name, help, type=self.convert)
 
332
        Option.__init__(self, name, help, type=self.convert, short_name=short_name)
333
333
        self._registry = registry
334
334
        if registry is None:
335
335
            if lazy_registry is None: