← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-18 12:46:49 UTC
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@samba.org-20111218124649-nf7i69ocg3k2roz3
Import absolute_import in a few places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
"""ControlDir is the basic control directory class.
18
20
 
19
21
The ControlDir class is the base for the control directory used
738
740
                return result, urlutils.unescape(a_transport.relpath(url))
739
741
            except errors.NotBranchError, e:
740
742
                pass
 
743
            except errors.PermissionDenied:
 
744
                pass
741
745
            try:
742
746
                new_t = a_transport.clone('..')
743
747
            except errors.InvalidURLJoin: