From 1c823470bdeeb5ae7c2595c53eb3d600f0a797aa Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Tue, 2 Jun 2020 00:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93response=E7=9A=84header=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89charset=E6=97=B6=EF=BC=8C=E5=B0=9D=E8=AF=95=E4=BB=8Eme?=
 =?UTF-8?q?ta=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/session_page.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/DrissionPage/session_page.py b/DrissionPage/session_page.py
index 577fe23..1b8c92d 100644
--- a/DrissionPage/session_page.py
+++ b/DrissionPage/session_page.py
@@ -5,6 +5,7 @@
 @File    :   session_page.py
 """
 import os
+import re
 from pathlib import Path
 from random import random
 from time import time
@@ -196,7 +197,7 @@ class SessionPage(object):
         # 设置referer和host值
         if self._url:
             if 'headers' in set(x.lower() for x in kwargs):
-                keys=set(x.lower() for x in kwargs['headers'])
+                keys = set(x.lower() for x in kwargs['headers'])
                 if 'referer' not in keys:
                     kwargs['headers']['Referer'] = self._url
                 if 'host' not in keys:
@@ -216,13 +217,14 @@ class SessionPage(object):
             return_value = False
         else:
             headers = dict(r.headers)
-            if 'Content-Type' not in headers:
-                charset = 'utf-8'
-            else:
-                if 'charset' not in headers['Content-Type']:
+            if 'Content-Type' not in headers or 'charset' not in headers['Content-Type']:
+                re_result = re.search(r'<meta.*?charset=([^"\']+)', r.text)
+                try:
+                    charset = re_result.group(1)
+                except:
                     charset = 'utf-8'
-                else:
-                    charset = headers['Content-Type'].split('=')[1]
+            else:
+                charset = headers['Content-Type'].split('=')[1]
             r.encoding = charset
             return_value = r
         return return_value