kcwebs 1.4__tar.gz → 1.5__tar.gz

{kcwebs-1.4 → kcwebs-1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 1.4
+Version: 1.5
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcwebs1.4
+Keywords: kcwebs1.5
 Platform: UNKNOWN

{kcwebs-1.4 → kcwebs-1.5}/kcwebs/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.4'
+__version__ = '1.5'
 
 kcwebsinfo={}
 kcwebsinfo['name']='kcwebs'                             #项目的名称

{kcwebs-1.4 → kcwebs-1.5}/kcwebs/utill/http.py

@@ -4,7 +4,9 @@ from requests.packages.urllib3.exceptions import InsecureRequestWarning
 requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 from .selenium3 import webdriver as webdriver3
 from .selenium3.webdriver.chrome.options import Options as Options3
+from .selenium3.webdriver.common.by import By as webdriver3By
 class Http:
+    By=webdriver3By
     "http请求类"
     set_proxies=None  #设置代理
     set_cookies={} #设置请求cookie
@@ -66,7 +68,9 @@ class Http:
                 self.get_cookies=self.cookieserTdict(self.get_cookie_str)
             if self.get_cookies!=self.set_cookies:
                 self.PhantomJsObj.delete_all_cookies()
-                self.PhantomJsObj.add_cookie(self.set_cookies)
+                for name,value in self.set_cookies:
+                    t={'name':name, 'value':value}
+                    self.PhantomJsObj.add_cookie(t)
         
 
 
@@ -81,8 +85,9 @@ class Http:
                     
         self.get_text = self.PhantomJsObj.page_source
         self.get_cookies=self.set_cookies
-        for k in self.PhantomJsObj.get_cookies():
-            self.get_cookies=self.__merge(self.get_cookies,k)
+        for k in reversed(self.PhantomJsObj.get_cookies()):
+            zd={k['name']:k['value']}
+            self.get_cookies=self.__merge(self.get_cookies,zd)
         if self.get_cookies:
             self.get_cookie_str=self.cookieTdictstr(self.get_cookies)
             self.get_cookies=self.cookieserTdict(self.get_cookie_str)
@@ -90,7 +95,7 @@ class Http:
             self.set_cookies=self.get_cookies
         if closedriver:
             self.PhantomJsObj.quit()
-    __ChromeObj=None
+    ChromeObj=None
     def open_Chrome(self,url,executable_path='',closedriver=True,setheadless=True):
         """通过Chrome浏览器引擎模拟浏览器请求 可以获取到js渲染后的html
 
@@ -99,14 +104,14 @@ class Http:
         setheadless 是否设置无头
 
         """
-        if not self.__ChromeObj:
+        if not self.ChromeObj:
             chrome_options = Options3()
             if setheadless:
                 chrome_options.add_argument("--headless") #设置无头
             chrome_options.add_argument("--disable-gpu")  # 禁用GPU硬件加速，适用于Linux和Windows系统
             chrome_options.add_argument("--no-sandbox")  # 禁用沙盒模式，在某些Linux系统上需要
             try:
-                self.__ChromeObj = webdriver3.Chrome(executable_path=executable_path,chrome_options=chrome_options)
+                self.ChromeObj = webdriver3.Chrome(executable_path=executable_path,chrome_options=chrome_options)
             except Exception as e:
                 import os
                 print("\033[93mChromeChromeChromeChromeChromeChromeChromeChromeChromeChromeChromeChromeve\033[0m",e)
@@ -155,22 +160,25 @@ class Http:
                 else:
                     raise Exception('暂不支持该操作系统版本，目前仅支持CentOS7和windows10')
         
-        if self.__ChromeObj:    
+        if self.ChromeObj:    
             if self.set_session:
                 self.get_cookies=self.set_cookies
-                for k in self.__ChromeObj.get_cookies():
+                for k in self.ChromeObj.get_cookies():
                     self.get_cookies=self.__merge(self.get_cookies,k)
                 if self.get_cookies:
                     self.get_cookie_str=self.cookieTdictstr(self.get_cookies)
                     self.get_cookies=self.cookieserTdict(self.get_cookie_str)
                 if self.get_cookies!=self.set_cookies:
-                    self.__ChromeObj.delete_all_cookies()
-                    self.__ChromeObj.add_cookie(self.set_cookies)
+                    self.ChromeObj.delete_all_cookies()
+                    for name,value in self.set_cookies:
+                        t={'name':name, 'value':value}
+                        self.ChromeObj.add_cookie(t)
             
             
 
-            self.__ChromeObj.get(url)
-
+            self.ChromeObj.get(url)
+            # time.sleep(5)
+            # print('self.ChromeObj.get_cookies()',self.ChromeObj.get_cookies())
             if not closedriver:
                 response = requests.head(url,cookies=self.set_cookies,allow_redirects=True)
                 resheader=dict(response.headers)
@@ -180,23 +188,23 @@ class Http:
 
 
             time.sleep(0.1)
-            self.get_text = self.__ChromeObj.page_source
+            self.get_text = self.ChromeObj.page_source
             self.get_cookies=self.set_cookies
-            for k in self.__ChromeObj.get_cookies():
-                self.get_cookies=self.__merge(self.get_cookies,k)
+            for k in reversed(self.ChromeObj.get_cookies()):
+                zd={k['name']:k['value']}
+                self.get_cookies=self.__merge(self.get_cookies,zd)
             if self.get_cookies:
                 self.get_cookie_str=self.cookieTdictstr(self.get_cookies)
                 self.get_cookies=self.cookieserTdict(self.get_cookie_str)
             if self.set_session:
-                self.set_cookies=self.get_cookies
+                self.set_cookies=self.get_cookie_str
             if closedriver:
-                print("关闭__ChromeObj")
-                self.__ChromeObj.close()
-                self.__ChromeObj.quit()
+                self.ChromeObj.close()
+                self.ChromeObj.quit()
     def close_webdriver(self):
-        if self.__ChromeObj:
-            self.__ChromeObj.close()
-            self.__ChromeObj.quit()
+        if self.ChromeObj:
+            self.ChromeObj.close()
+            self.ChromeObj.quit()
         if self.PhantomJsObj:
             self.PhantomJsObj.quit()
             
@@ -253,13 +261,39 @@ class Http:
         self.get_content=response.content
         self.get_response=response
         self.get_status_code=int(response.status_code)
+    def __is_index(self,params,index):
+        """判断列表或字典里的索引是否存在
+
+        params  列表或字典
+
+        index   索引值
+
+        return Boolean类型
+        """
+        try:
+            params[index]
+        except KeyError:
+            return False
+        except IndexError:
+            return False
+        else:
+            return True
     def __merge(self,dict1, dict2):
         "合并两个字典"
         C_dict = {}
         for key,value in dict1.items():
             C_dict[key]=value
         for key,value in dict2.items():
-            C_dict[key]=value
+            if value:
+                if isinstance(value, str) or (self.__is_index(C_dict,key) and isinstance(C_dict[key], str)):
+                    if self.__is_index(C_dict,key):
+                        t1,t2=len(str(value)),len(str(C_dict[key]))
+                        if t1>=t2:
+                            C_dict[key]=value
+                    else:
+                        C_dict[key]=value
+                else:
+                    C_dict[key]=value
         return C_dict
     def cookieserTdict(self,cookiesstr):
         "cookies字符串转换字典"

{kcwebs-1.4 → kcwebs-1.5}/kcwebs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 1.4
+Version: 1.5
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcwebs1.4
+Keywords: kcwebs1.5
 Platform: UNKNOWN

{kcwebs-1.4 → kcwebs-1.5}/kcwebs.egg-info/top_level.txt

@@ -1,6 +1,7 @@
 kcwebs
 kcwebs/common
 kcwebs/config
+kcwebs/pid
 kcwebs/tempfile
 kcwebs/tempfile/kcwebs
 kcwebs/tempfile/kcwebs/app