← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Merge from integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
23
23
import sys
24
24
from unittest import TestSuite
25
25
from warnings import warn
 
26
try:
 
27
    import xml.sax.saxutils
 
28
except ImportError:
 
29
    raise ImportError("We were unable to import 'xml.sax.saxutils',"
 
30
                      " most likely you have an xml.pyc or xml.pyo file"
 
31
                      " lying around in your bzrlib directory."
 
32
                      " Please remove it.")
26
33
 
27
34
 
28
35
import bzrlib
33
40
import bzrlib.errors as errors
34
41
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
35
42
                           NoSuchRevision, HistoryMissing, NotBranchError,
36
 
                           DivergedBranches, LockError, 
 
43
                           DivergedBranches, LockError,
37
44
                           UninitializableFormat,
38
45
                           UnlistableStore,
39
46
                           UnlistableBranch, NoSuchFile, NotVersionedError,
136
143
    @deprecated_function(zero_eight)
137
144
    def initialize(base):
138
145
        """Create a new working tree and branch, rooted at 'base' (url)
 
146
 
 
147
        NOTE: This will soon be deprecated in favour of creation
 
148
        through a BzrDir.
139
149
        """
140
150
        # imported here to prevent scope creep as this is going.
141
151
        from bzrlib.workingtree import WorkingTree