← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 01:01:53 UTC
  • mfrom: (5597 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5599.
  • Revision ID: john@arbash-meinel.com-20110112010153-op19823r9e6hy7u6
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
30
30
    )
31
31
from bzrlib import bencode
32
32
""")
33
 
from bzrlib.tuned_gzip import GzipFile
 
33
from gzip import GzipFile
34
34
 
35
35
 
36
36
def topo_iter_keys(vf, keys=None):
564
564
        zip_file = GzipFile(None, mode='rb', fileobj=sio)
565
565
        try:
566
566
            file_version_id = zip_file.readline()
567
 
            return MultiParent.from_patch(zip_file.read())
 
567
            content = zip_file.read()
 
568
            return MultiParent.from_patch(content)
568
569
        finally:
569
570
            zip_file.close()
570
571