From 6953d43fe3fbeedc6d672ba3685cbc9bb3feae4b Mon Sep 17 00:00:00 2001 From: flaskfarm Date: Fri, 14 Oct 2022 14:49:10 +0900 Subject: [PATCH] update --- lib/framework/__init__.py | 2 +- lib/framework/init_route.py | 3 ++- lib/framework/version.py | 1 + lib/support/base/subprocess.py | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 lib/framework/version.py diff --git a/lib/framework/__init__.py b/lib/framework/__init__.py index 889962e..2f77c30 100644 --- a/lib/framework/__init__.py +++ b/lib/framework/__init__.py @@ -1,5 +1,5 @@ -VERSION="4.0.0" from .init_main import Framework +from .version import VERSION frame = Framework.get_instance() F = frame diff --git a/lib/framework/init_route.py b/lib/framework/init_route.py index 7acbc18..7173778 100644 --- a/lib/framework/init_route.py +++ b/lib/framework/init_route.py @@ -4,7 +4,7 @@ import traceback from flask import jsonify, redirect, request, send_from_directory from flask_login import login_required -from framework import VERSION, F +from framework import F @F.app.route('/global/ajax/', methods=['GET', 'POST']) @@ -91,6 +91,7 @@ def home(): @F.app.route("/version") def get_version(): + from .version import VERSION return VERSION @F.app.route("/open/") diff --git a/lib/framework/version.py b/lib/framework/version.py new file mode 100644 index 0000000..06ce668 --- /dev/null +++ b/lib/framework/version.py @@ -0,0 +1 @@ +VERSION="4.0.0" \ No newline at end of file diff --git a/lib/support/base/subprocess.py b/lib/support/base/subprocess.py index 7ef0eb0..39e7e06 100644 --- a/lib/support/base/subprocess.py +++ b/lib/support/base/subprocess.py @@ -132,9 +132,9 @@ class SupportSubprocess(object): self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') else: if self.uid == None: - process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') + process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') else: - process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, preexec_fn=demote(self.uid, self.gid), encoding='utf8') + process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, preexec_fn=demote(self.uid, self.gid), encoding='utf8') SupportSubprocess.instance_list.append(self) self.start_communicate() self.start_send_callback()