From 101a35b46b5585815f27f1d6c9451b038c2c163e Mon Sep 17 00:00:00 2001
From: chliny <chliny11@gmail.com>
Date: Fri, 2 May 2014 00:52:54 +0800
Subject: [PATCH] =?UTF-8?q?try=E5=A4=84=E7=90=86request=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xfdown.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/xfdown.py b/xfdown.py
index fcdeb94..9482c7d 100755
--- a/xfdown.py
+++ b/xfdown.py
@@ -132,16 +132,20 @@ def __request(self,url,data=None,savecookie=False):
         """
             请求url
         """
-        if data:
-            data = parse.urlencode(data).encode('utf-8')
-            fp=request.urlopen(url,data)
-        else:
-            fp=request.urlopen(url)
+        istr = ''
         try:
-            str = fp.read().decode('utf-8')
+            if data:
+                data = parse.urlencode(data).encode('utf-8')
+                fp=request.urlopen(url,data)
+            else:
+                fp=request.urlopen(url)
+            try:
+                istr = fp.read().decode('utf-8')
 
-        except UnicodeDecodeError:
-            str = fp.read()
+            except UnicodeDecodeError:
+                istr = fp.read()
+        except:
+            return False
 
         if savecookie == True:
             if hasattr(self,"pswd"):
@@ -150,7 +154,7 @@ def __request(self,url,data=None,savecookie=False):
                 self.cookieJar.save(ignore_discard=True, ignore_expires=True)
 
         fp.close()
-        return str
+        return istr
     def __getverifycode(self):
 
         urlv = 'http://check.ptlogin2.qq.com/check?uin=%s&appid=567008010&r=%s'%(self.__qq,random.Random().random())