changeset e5188f91d789 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=e5188f91d789
description:
Backed out changeset 94997ed66e01
issue9679
diffstat:
trytond/config.py | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diffs (45 lines):
diff -r 94997ed66e01 -r e5188f91d789 trytond/config.py
--- a/trytond/config.py Mon Oct 12 17:46:39 2020 +0200
+++ b/trytond/config.py Mon Oct 12 18:02:39 2020 +0200
@@ -4,8 +4,6 @@
import configparser
import urllib.parse
import logging
-import sys
-from functools import wraps
__all__ = ['config', 'get_hostname', 'get_port', 'split_netloc',
'parse_listen', 'parse_uri']
@@ -39,16 +37,6 @@
return urllib.parse.urlparse(uri)
-def before_modules(func):
- @wraps(func)
- def wrapper(*args, **kwargs):
- if 'trytond.modules' in sys.modules:
- raise RuntimeError(
- "%s called after trytond.modules is imported" % func.__name__)
- return func(*args, **kwargs)
- return wrapper
-
-
class TrytonConfigParser(configparser.ConfigParser):
def __init__(self):
@@ -101,7 +89,6 @@
self.update_environ()
self.update_etc()
- @before_modules
def update_environ(self):
for key, value in os.environ.items():
if not key.startswith('TRYTOND_'):
@@ -114,7 +101,6 @@
self.add_section(section)
self.set(section, option, value)
- @before_modules
def update_etc(self, configfile=os.environ.get('TRYTOND_CONFIG')):
if isinstance(configfile, str):
configfile = [configfile]