← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-12 20:46:42 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912204642-91599869cc863f07
Cleanup, deprecated, and get the tests passing again.

bzrlib.builtins.merge is heavily used by the test suite, though it is
really the wrong place for a function like that.
lazy imports work badly with doctests, but so far none of the doc tested
modules had anything worth testing in that fashion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
46
46
    )
47
47
""")
48
48
 
49
 
from bzrlib.symbol_versioning import (deprecated_method, zero_eight)
 
49
from bzrlib.symbol_versioning import (
 
50
    deprecated_function,
 
51
    deprecated_method,
 
52
    zero_eight,
 
53
    zero_eleven,
 
54
    )
50
55
# Compatibility
51
56
from bzrlib.option import Option
52
57
 
320
325
            return None
321
326
 
322
327
 
 
328
# Technically, this function hasn't been use in a *really* long time
 
329
# but we are only deprecating it now.
 
330
@deprecated_function(zero_eleven)
323
331
def parse_spec(spec):
324
332
    """
325
333
    >>> parse_spec(None)