~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
179
179
        self.type = type
180
180
        self._short_name = short_name
181
181
        if type is None:
182
 
            assert argname is None
 
182
            if argname:
 
183
                raise ValueError('argname not valid for booleans')
183
184
        elif argname is None:
184
185
            argname = 'ARG'
185
186
        self.argname = argname