← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml7.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-08 08:52:18 UTC
  • mfrom: (5012.2.1 integration2)
  • Revision ID: pqm@pqm.ubuntu.com-20100208085218-xifmoycns98p9el4
(vila) (trivial) Fix imports in blackbox/test_add.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml7.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib import (
18
18
    inventory,
28
28
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
29
29
    format_num = '7'
30
30
 
31
 
    def _unpack_entry(self, elt):
 
31
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
32
32
        kind = elt.tag
33
33
        if not kind in self.supported_kinds:
34
34
            raise AssertionError('unsupported entry kind %s' % kind)
41
41
            return inventory.TreeReference(file_id, name, parent_id, revision,
42
42
                                           reference_revision)
43
43
        else:
44
 
            return xml6.Serializer_v6._unpack_entry(self, elt)
 
44
            return xml6.Serializer_v6._unpack_entry(self, elt,
 
45
                entry_cache=entry_cache, return_from_cache=return_from_cache)
45
46
 
46
47
serializer_v7 = Serializer_v7()