kunapi 1.6__tar.gz → 1.8__tar.gz

{kunapi-1.6 → kunapi-1.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: kunapi
-Version: 1.6
+Version: 1.8
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -8,6 +8,6 @@ Author-email: fengkun01@qq.com
 Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
-Description: kunapi
-Keywords: kunapi1.6
-Platform: UNKNOWN
+Keywords: kunapi1.8
+
+kunapi

{kunapi-1.6 → kunapi-1.8}/kunapi/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.6'
+__version__ = '1.8'
 try:
     from .app import web
 except:pass

{kunapi-1.6 → kunapi-1.8}/kunapi/app.py

@@ -73,7 +73,7 @@ class web:
                         env['url_scheme']=env['HTTP_X_REAL_IP']
                     except:
                         env['url_scheme']=env['wsgi.url_scheme'],
-                    status,resheader,body=self.__routes(env)
+                    status,resheader,body=self.__routes(self,env)
                     if type(body) is bytes:
                         pass
                     else:
@@ -248,9 +248,9 @@ class web:
         globals.VAR.defmodular=''
         globals.VAR.defplug=''
         route=self.__config.route
-        modular=self.__get_modular(header)
+        modular=web.__get_modular(self,header)
         if route['plug']:
-            getplug=self.__get_plug(header)
+            getplug=web.__get_plug(self,header)
         else:
             getplug=''
         routedefault=route['default']
@@ -270,7 +270,8 @@ class web:
             #     plug=route['plug']
             if getplug:
                 plug=getplug
-                routedefault,PATH_INFO=self.__getconfigroute(
+                routedefault,PATH_INFO=web.__getconfigroute(
+                    self,
                     PATH_INFO,
                     header
                 )
@@ -287,7 +288,8 @@ class web:
                                 param.append(urllib.parse.unquote(path))
                         i+=1
             else:                  #配置模块没有配置插件
-                routedefault,PATH_INFO=self.__getconfigroute(
+                routedefault,PATH_INFO=web.__getconfigroute(
+                    self,
                     PATH_INFO,
                     header
                 )
@@ -310,7 +312,8 @@ class web:
         #     plug=route['plug']
         elif getplug:
             plug=getplug
-            routedefault,PATH_INFO=self.__getconfigroute(
+            routedefault,PATH_INFO=web.__getconfigroute(
+                self,
                 PATH_INFO,
                 header
             )
@@ -330,7 +333,7 @@ class web:
                             param.append(urllib.parse.unquote(path))
                     i+=1
         else: #完全默认
-            routedefault,PATH_INFO=self.__getconfigroute(PATH_INFO,header)
+            routedefault,PATH_INFO=web.__getconfigroute(self,PATH_INFO,header)
             if routedefault: #使用默认路由
                 for path in PATH_INFO:
                     if path:
@@ -388,7 +391,7 @@ class web:
         PATH_INFO=header['PATH_INFO'].split('/')
         if PATH_INFO[0]==' ' or PATH_INFO[0]=='':
             del PATH_INFO[0]
-        methods,modular,plug,files,funct,param=self.defaultroute(header,PATH_INFO)
+        methods,modular,plug,files,funct,param=web.defaultroute(self,header,PATH_INFO)
         globals.VAR.component=(methods,modular,plug,files,funct,param)
         globals.VAR.defmodular=''
         globals.VAR.defplug=''
@@ -416,7 +419,7 @@ class web:
         except:
             globals.HEADER.HTTP_USER_AGENT=None
     def __del_globals(self):
-        pass
+        # pass
         globals.VAR = None
         globals.HEADER = None
         globals.G = None
@@ -424,14 +427,19 @@ class web:
         body="这是一个http测试服务器"
         status="200 ok"
         resheader={"Content-Type":"application/json; charset=utf-8"}
-        self.__set_globals(header)
+        web.__set_globals(self,header)
+        # PATH_INFO=header['PATH_INFO'].split('/')
+        # if PATH_INFO[0]==' ' or PATH_INFO[0]=='':
+        #     del PATH_INFO[0]
+        # methods,modular,plug,files,funct,param=web.defaultroute(self,header,PATH_INFO)
+        # globals.VAR.component=(methods,modular,plug,files,funct,param)
         methods,modular,plug,files,funct,param=globals.VAR.component
         if header['REQUEST_METHOD'] in methods:
             try:
-                obj=getattr(self.__appname,modular)
+                obj=getattr(web.__appname,modular)
             except (AttributeError,UnboundLocalError):
                 status="500 Internal Server Error"
-                body=self.__tpl(
+                body=web.__tpl(
                     title = status,
                     e=status,
                     data="路由不存在："+str(modular)+"/"
@@ -441,7 +449,7 @@ class web:
                     obj=getattr(obj,"controller")
                 except (AttributeError,UnboundLocalError):
                     status="404 Not Found"
-                    body=self.__tpl(
+                    body=web.__tpl(
                         title = status,
                         e=status,
                         data="路由不存在："+str(modular)+"/controller/"
@@ -453,14 +461,15 @@ class web:
                         con="无法找到目录："+str(modular)+"/controller/"+str(plug)+"/"
                         try:
                             data=getattr(obj,"error")(e,con)
-                            body,status,resheader=self.__tran(
+                            body,status,resheader=web.__tran(
+                                self,
                                 data,
                                 status,
                                 resheader
                             )
                         except (AttributeError,UnboundLocalError):
                             status="404 Not Found"
-                            body=self.__tpl(
+                            body=web.__tpl(
                                 title = status,
                                 e=status,data=con
                             )
@@ -470,7 +479,7 @@ class web:
                             if self.__config.app['app_debug']:
                                 print(traceback.format_exc())
                                 errms=traceback.format_exc().split("\n")
-                            body=self.__tpl(
+                            body=web.__tpl(
                                 title = status,
                                 data=errms,e=e
                             )
@@ -481,14 +490,15 @@ class web:
                             con="无法找到文件："+str(modular)+"/controller/"+str(plug)+"/"+str(files)+".py"
                             try:
                                 data=getattr(obj,"error")(e,con)
-                                body,status,resheader=self.__tran(
-                                    data
+                                body,status,resheader=web.__tran(
+                                    self
+                                    ,data
                                     ,status
                                     ,resheader
                                 )
                             except (AttributeError,UnboundLocalError):
                                 status="404 Not Found"
-                                body=self.__tpl(
+                                body=web.__tpl(
                                     title = status
                                     ,data=con
                                     ,e=status)
@@ -498,7 +508,7 @@ class web:
                                 if self.__config.app['app_debug']:
                                     print(traceback.format_exc())
                                     errms=traceback.format_exc().split("\n")
-                                body=self.__tpl(
+                                body=web.__tpl(
                                     title = status,
                                     data=errms,
                                     e=e
@@ -510,8 +520,8 @@ class web:
                                     try:
                                         data=getattr(obj,self.__config.app['before_request'])()
                                         if data:
-                                            body,status,resheader=self.__tran(
-                                                data,
+                                            body,status,resheader=web.__tran(
+                                                self,data,
                                                 status,
                                                 resheader
                                             )
@@ -521,8 +531,8 @@ class web:
                                     except Exception as e:
                                         try:
                                             data=getattr(obj,"error")(e,traceback.format_exc().split("\n"))
-                                            body,status,resheader=self.__tran(
-                                                data,
+                                            body,status,resheader=web.__tran(
+                                                self,data,
                                                 status,
                                                 resheader
                                             )
@@ -532,7 +542,7 @@ class web:
                                             errms=status
                                             if self.__config.app['app_debug']:
                                                 errms=traceback.format_exc().split("\n")
-                                            body=self.__tpl(
+                                            body=web.__tpl(
                                                 title = status,
                                                 data=errms,e=e
                                             )
@@ -543,7 +553,7 @@ class web:
                                             if self.__config.app['app_debug']:
                                                 print(traceback.format_exc())
                                                 errms=traceback.format_exc().split("\n")
-                                            body=self.__tpl(
+                                            body=web.__tpl(
                                                 title = status,
                                                 data=errms,e=e
                                             )
@@ -554,16 +564,16 @@ class web:
                                         data=getattr(obj,funct)(*param) #兼容性之前的控制器
                                     else:
                                         data=getattr(objclass,funct)(*param)
-                                    body,status,resheader=self.__tran(
-                                        data,
+                                    body,status,resheader=web.__tran(
+                                        self,data,
                                         status,
                                         resheader
                                     )
                             except Exception as e:
                                 try:
                                     data=getattr(obj,"error")(e,traceback.format_exc().split("\n"))
-                                    body,status,resheader=self.__tran(
-                                        data,
+                                    body,status,resheader=web.__tran(
+                                        self,data,
                                         status,
                                         resheader
                                     )
@@ -573,7 +583,7 @@ class web:
                                     if self.__config.app['app_debug']:
                                         print(traceback.format_exc())
                                         errms=traceback.format_exc().split("\n")
-                                    body=self.__tpl(
+                                    body=web.__tpl(
                                         title = status,
                                         data=errms,
                                         e=e
@@ -584,14 +594,14 @@ class web:
                                     if self.__config.app['app_debug']:
                                         print(traceback.format_exc())
                                         errms=traceback.format_exc().split("\n")
-                                    body=self.__tpl(
+                                    body=web.__tpl(
                                         title = status,
                                         data=errms,
                                         e=e
                                     )
         else:
             status="405 Method Not Allowed"
-            body=self.__tpl(
+            body=web.__tpl(
                 title = status,
                 data='405 Method Not Allowed',
                 e=''
@@ -605,13 +615,13 @@ class web:
             try:
                 data=getattr(obj,self.__config.app['after_request'])(body,status,resheader)
                 if data:
-                    body,status,resheader=self.__tran(data,status,resheader)
+                    body,status,resheader=web.__tran(self,data,status,resheader)
             except (AttributeError,UnboundLocalError):pass
             except Exception as e:
                 try:
                     data=getattr(obj,"error")(e,traceback.format_exc().split("\n"))
-                    body,status,resheader=self.__tran(
-                        data,
+                    body,status,resheader=web.__tran(
+                        self,data,
                         status,
                         resheader
                     )
@@ -621,7 +631,7 @@ class web:
                     if self.__config.app['app_debug']:
                         print(traceback.format_exc())
                         errms=traceback.format_exc().split("\n")
-                    body=self.__tpl(
+                    body=web.__tpl(
                         title = status
                         ,data=errms,
                         e=e
@@ -632,7 +642,7 @@ class web:
                     if self.__config.app['app_debug']:
                         print(traceback.format_exc())
                         errms=traceback.format_exc().split("\n")
-                    body=self.__tpl(
+                    body=web.__tpl(
                         title = status,
                         data=errms,
                         e=""
@@ -640,12 +650,15 @@ class web:
         resheaders=[]
         for key in resheader:
             resheaders.append((key,resheader[key]))
+        web.__del_globals(self)
+
+        
         if self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebs' or self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebsp':#请求后执行的函数
             try:
                 getattr(obj,"rfdsgeagesegdsfdsfdrrsebskwebsafterrequest")() #关闭数据库相关连接
             except:pass
 
-        self.__del_globals()
+
         if isinstance(resheaders,list):
             if not body:
                 body=''
@@ -655,15 +668,15 @@ class web:
                 body=str(body)
             return str(status),resheaders,body
         else:
-            raise
-    def __tpl(self,**context):
+            raise Exception()
+    def __tpl(**context):
         arr=json_encode({
             'title':context['title'],
             'msg':str(context['e']),
             'error':context['data']
         })
         return arr
-    # def __tpl(__tpl,**context):
+    # def __tpl(**context):
     #     title,status,error=context
     #     arr=json_encode({
     #         'title':title,
@@ -730,7 +743,6 @@ class web:
             'HTTP_X_REAL_IP':env.get('HTTP_X_REAL_IP'),
             'files':files
         }
-        
         p=(config.app['staticpath']+reqheader['RAW_URI'].replace(' ',''))
         status='200 ok'
         if os.path.isfile(p):
@@ -763,7 +775,7 @@ class web:
             resheader.append(("Last-Modified",otherStyleTime))
             resheader.append(("ETag",ETag))
         else:
-            status,resheader,body=self.__routes(reqheader)
+            status,resheader,body=web.__routes(self,reqheader)
             from kunapi import __version__
             resheader.append(('Server', "kunapi-"+__version__))
             if type(body) is bytes:
@@ -772,7 +784,7 @@ class web:
                 body=bytes(body, encoding='utf-8')
         start_response(status,resheader)
         return [body]
-    def __waitress(self,host,port,threads=1):
+    def __waitress(self,host,port):
         if host=='0.0.0.0':
             print("\033[32m* （CTRL+单击打开）http://127.0.0.1:"+str(port)+"（按CTRL+C退出）")
         else:
@@ -782,8 +794,8 @@ class web:
         else:
             print('\033[37m* 调试器：已关闭')
         from waitress import serve
-        serve(self.__application, host=host, port=port,threads=threads,channel_timeout=3600) #框架不支持多线程 所以 threads设为1
-    def __http_wsgi(self,host,port):
+        serve(self.__application, host=host, port=port,threads=1,channel_timeout=3600) #框架不支持多线程 所以 threads设为1
+    def __http_wsgi(self,host,port,filename):
         "http——wsgi测试服务 windows建议使用Waitress‌"
         from wsgiref.simple_server import make_server
         print("* \033[1;31;40m! 警告：\033[0m这是一个wsgiref开发服务器。不要在生产环境中部署使用它")

{kunapi-1.6 → kunapi-1.8}/kunapi/kunapi.py

@@ -8,9 +8,9 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
     if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr:
         fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr
     python_version=platform.python_version()
-    if python_version[0:3]!='3.8':
-        print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"依赖python3.8，与你现在的python"+python_version+"不兼容")
-        exit()
+    # if python_version[0:3]!='3.8':
+    #     print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"依赖python3.8，与你现在的python"+python_version+"不兼容")
+    #     exit()
     if 'Linux' in get_sysinfo()['platform'] or 'Windows' in get_sysinfo()['platform']:pass
     else:
         print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"不支持当前操作系统 解压在linux或windows系统下运行")

{kunapi-1.6 → kunapi-1.8}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: kunapi
-Version: 1.6
+Version: 1.8
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -8,6 +8,6 @@ Author-email: fengkun01@qq.com
 Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
-Description: kunapi
-Keywords: kunapi1.6
-Platform: UNKNOWN
+Keywords: kunapi1.8
+
+kunapi

{kunapi-1.6 → kunapi-1.8}/kunapi.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 kunapi = kunapi.kunapi:cill_start
-

{kunapi-1.6 → kunapi-1.8}/kunapi.egg-info/requires.txt

@@ -2,5 +2,5 @@ gunicorn==20.0.4
 waitress==3.0.0
 watchdog==4.0.0
 filetype==1.2.0
-psutil==5.8.0
+psutil==5.9.4
 requests==2.32.4

{kunapi-1.6 → kunapi-1.8}/setup.py

@@ -31,7 +31,7 @@ def start():
         maintainer_email = kcwsinfo["maintainer_email"],
         url=kcwsinfo['url'],
         packages =  b,
-        install_requires = ['gunicorn==20.0.4','waitress==3.0.0','watchdog==4.0.0','filetype==1.2.0','psutil==5.8.0','requests==2.32.4'], #第三方包
+        install_requires = ['gunicorn==20.0.4','waitress==3.0.0','watchdog==4.0.0','filetype==1.2.0','psutil==5.9.4','requests==2.32.4'], #第三方包
         package_data = {
             '': ['*.html', '*.js','*.css','*.jpg','*.png','*.gif'],
         },