From 789d8d3531b1f4915465ff3718468a1d8941a613 Mon Sep 17 00:00:00 2001 From: elpolilla Date: Wed, 10 Sep 2008 02:49:05 +0000 Subject: [PATCH] bugfix in decompressor tool --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40219 --- scrapy/trunk/scrapy/utils/decompressor.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scrapy/trunk/scrapy/utils/decompressor.py b/scrapy/trunk/scrapy/utils/decompressor.py index a0c10fb1d..a9ca4594b 100644 --- a/scrapy/trunk/scrapy/utils/decompressor.py +++ b/scrapy/trunk/scrapy/utils/decompressor.py @@ -6,8 +6,11 @@ import zipfile import tarfile import gzip import bz2 -from cStringIO import StringIO from scrapy.http import ResponseBody +try: + from cStringIO import StringIO +except: + from StringIO import StringIO class Decompressor(object): class ArchiveIsEmpty(Exception): @@ -16,9 +19,10 @@ class Decompressor(object): def __init__(self): self.decompressors = [self.is_tar, self.is_zip, self.is_gzip, self.is_bzip2] + def is_tar(self, response): try: - tar_file = tarfile.open(fileobj=self.archive) + tar_file = tarfile.open(name='tar.tmp', fileobj=self.archive) except tarfile.ReadError: return False if tar_file.members: