nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup casting from values in cfg

Browse Source
This commit is contained in:
Sunil Mohan Adapa 2015-09-29 22:50:02 +05:30
parent b63ec9bffc
commit 45fd4f2a53
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/__main__.py
View File

@ -244,7 +244,7 @@ def configure_django():
STATIC_URL='/'.join([cfg.server_dir, 'static/']).replace('//', '/'), STATIC_URL='/'.join([cfg.server_dir, 'static/']).replace('//', '/'),
STRONGHOLD_PUBLIC_NAMED_URLS=('users:login', 'users:logout'), STRONGHOLD_PUBLIC_NAMED_URLS=('users:login', 'users:logout'),
TEMPLATE_CONTEXT_PROCESSORS=context_processors, TEMPLATE_CONTEXT_PROCESSORS=context_processors,
USE_X_FORWARDED_HOST=bool(cfg.use_x_forwarded_host)) USE_X_FORWARDED_HOST=cfg.use_x_forwarded_host)
django.setup() django.setup()
logger.info('Configured Django with applications - %s', applications) logger.info('Configured Django with applications - %s', applications)

4
plinth/cfg.py
View File

@ -96,6 +96,8 @@ def read():
else: else:
if datatype == 'int': if datatype == 'int':
value = int(value) value = int(value)
if datatype == 'bool': if datatype == 'bool':
value = value.lower() == 'true' value = (value.lower() == 'true')
globals()[name] = value globals()[name] = value

1
plinth/tests/test_cfg.py
View File

@ -222,6 +222,7 @@ class CfgTestCase(unittest.TestCase):
self.assertEqual(int(parser.get('Network', 'port')), cfg.port) self.assertEqual(int(parser.get('Network', 'port')), cfg.port)
self.assertEqual(parser.get('Network', 'secure_proxy_ssl_header'), self.assertEqual(parser.get('Network', 'secure_proxy_ssl_header'),
cfg.secure_proxy_ssl_header) cfg.secure_proxy_ssl_header)
self.assertIsInstance(cfg.use_x_forwarded_host, bool)
self.assertEqual(parser.get('Network', 'use_x_forwarded_host'), self.assertEqual(parser.get('Network', 'use_x_forwarded_host'),
str(cfg.use_x_forwarded_host)) str(cfg.use_x_forwarded_host))
self.assertEqual(parser.get('Misc', 'danube_edition'), self.assertEqual(parser.get('Misc', 'danube_edition'),