~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/request.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-23 23:26:35 UTC
  • mto: This revision was merged to the branch mainline in revision 6486.
  • Revision ID: jelmer@samba.org-20120223232635-opp7nq6ly9562x36
Use controldir rather than bzrdir in a couple more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
import threading
37
37
 
38
38
from bzrlib import (
39
 
    bzrdir,
40
39
    debug,
41
40
    errors,
42
41
    osutils,
47
46
    )
48
47
from bzrlib.lazy_import import lazy_import
49
48
lazy_import(globals(), """
 
49
from bzrlib import bzrdir
50
50
from bzrlib.bundle import serializer
51
51
 
52
52
import tempfile