You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.2 KiB
32 lines
1.2 KiB
11 years ago
|
From 62f94b534289b7ab0bda879962bf6efb124a9930 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tomas Radej <tradej@redhat.com>
|
||
|
|
Date: Tue, 2 Sep 2014 12:52:50 +0200
|
||
|
|
Subject: [PATCH] StringIO patch
|
||
|
|
|
||
|
|
---
|
||
|
|
urlgrabber/grabber.py | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
|
||
|
|
index 35c091e..26335d1 100644
|
||
|
|
--- a/urlgrabber/grabber.py
|
||
|
|
+++ b/urlgrabber/grabber.py
|
||
|
|
@@ -1298,12 +1298,12 @@ class PyCurlFileObject(object):
|
||
|
|
start = self._range[0] - pos
|
||
|
|
stop = self._range[1] - pos
|
||
|
|
if start < len(buf) and stop > 0:
|
||
|
|
- if not six.PY3 or isinstance(self.fo, StringIO):
|
||
|
|
+ if not six.PY3 and isinstance(self.fo, StringIO):
|
||
|
|
self.fo.write(buf[max(start, 0):stop].decode('utf-8'))
|
||
|
|
else:
|
||
|
|
self.fo.write(buf[max(start, 0):stop])
|
||
|
|
else:
|
||
|
|
- if not six.PY3 or isinstance(self.fo, StringIO):
|
||
|
|
+ if not six.PY3 and isinstance(self.fo, StringIO):
|
||
|
|
self.fo.write(buf.decode('utf-8'))
|
||
|
|
else:
|
||
|
|
self.fo.write(buf)
|
||
|
|
--
|
||
|
|
1.9.3
|
||
|
|
|