Refactor temp file path retrieval to use tempfile.gettempdir() and clean up vari…

…able assignment in BaseView class
1 parent 5c6f1723
...@@ -22,6 +22,7 @@ from .models.handlers import LogDBSession ...@@ -22,6 +22,7 @@ from .models.handlers import LogDBSession
from .models.meta import Base from .models.meta import Base
from .models.users import init_model from .models.users import init_model
from .models import Route from .models import Route
import tempfile
# from deform import ZPTRendererFactory, Form # from deform import ZPTRendererFactory, Form
# from deform.widget import default_resource_registry # from deform.widget import default_resource_registry
...@@ -340,7 +341,7 @@ def main(global_config, **settings): ...@@ -340,7 +341,7 @@ def main(global_config, **settings):
if 'timezone' not in settings: if 'timezone' not in settings:
settings['timezone'] = DefaultTimeZone settings['timezone'] = DefaultTimeZone
# settings["captcha_files"] = "c:\\tmp\\captcha\\" # settings["captcha_files"] = "c:\\tmp\\captcha\\"
tmp = get_params("temp_files", f"{os.sep}tmp", settings=settings) tmp = get_params("temp_files", tempfile.gettempdir(), settings=settings)
settings["temp_files"] = tmp settings["temp_files"] = tmp
settings['captcha_files'] = os.path.join(tmp, "captcha") + os.sep settings['captcha_files'] = os.path.join(tmp, "captcha") + os.sep
...@@ -644,6 +645,7 @@ def add_global(event): ...@@ -644,6 +645,7 @@ def add_global(event):
event['get_base_menus'] = BASE_CLASS.get_menus event['get_base_menus'] = BASE_CLASS.get_menus
event['has_modules'] = has_modules event['has_modules'] = has_modules
event['get_params'] = get_params_ event['get_params'] = get_params_
# event['urlencode'] = urlencode # event['urlencode'] = urlencode
# event['quote_plus'] = quote_plus # event['quote_plus'] = quote_plus
# event['quote'] = quote # event['quote'] = quote
......
...@@ -1104,7 +1104,7 @@ class BaseView(object): ...@@ -1104,7 +1104,7 @@ class BaseView(object):
return self.returned_form(form, **kwargs) return self.returned_form(form, **kwargs)
def query_id(self, id=None): def query_id(self, id=None):
id=id or self.req.matchdict['id'] id = id or self.req.matchdict['id']
return self.table.query_id(id) return self.table.query_id(id)
# if self.req.user: # if self.req.user:
# if hasattr(self.table, 'company_id') and self.req.user.company_id: # if hasattr(self.table, 'company_id') and self.req.user.company_id:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!