Rev 5595: Don't use tuned_gzip.GzipFile in knit.py in http://bazaar.launchpad.net/~jameinel/bzr/2.3-gzip-py2.7

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.3-gzip-py2.7

------------------------------------------------------------
revno: 5595
revision-id: john at arbash-meinel.com-20110111204236-mthyd83cgt2j4c6o
parent: john at arbash-meinel.com-20110111202153-ca940pd0yvbj90o1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.3-gzip-py2.7
timestamp: Tue 2011-01-11 14:42:36 -0600
message:
  Don't use tuned_gzip.GzipFile in knit.py
-------------- next part --------------
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2010-06-04 03:09:35 +0000
+++ b/bzrlib/knit.py	2011-01-11 20:42:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2010 Canonical Ltd
+# Copyright (C) 2006-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -54,6 +54,7 @@
 
 from cStringIO import StringIO
 from itertools import izip
+import gzip
 import operator
 import os
 import sys
@@ -1879,7 +1880,7 @@
         :return: the header and the decompressor stream.
                  as (stream, header_record)
         """
-        df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(raw_data))
+        df = gzip.GzipFile(mode='rb', fileobj=StringIO(raw_data))
         try:
             # Current serialise
             rec = self._check_header(key, df.readline())
@@ -1894,7 +1895,7 @@
         # 4168 calls in 2880 217 internal
         # 4168 calls to _parse_record_header in 2121
         # 4168 calls to readlines in 330
-        df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(data))
+        df = gzip.GzipFile(mode='rb', fileobj=StringIO(data))
         try:
             record_contents = df.readlines()
         except Exception, e: