nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils: Simplify YAMLFile by removing the post_exit argument

Browse Source 
Whatever function is passed in post_exit can simply be called by the caller
itself as the next statement.

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Joseph Nuthalapati 2019-02-08 10:43:54 +05:30 committed by Sunil Mohan Adapa
parent 938dadcae0
commit 753881b80f
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actions/matrixsynapse
View File

@ -31,7 +31,6 @@ from plinth import action_utils
from plinth.modules import letsencrypt from plinth.modules import letsencrypt
from plinth.modules.matrixsynapse import (CONFIG_FILE_PATH, from plinth.modules.matrixsynapse import (CONFIG_FILE_PATH,
get_configured_domain_name) get_configured_domain_name)
from plinth.utils import YAMLFile
def parse_arguments(): def parse_arguments():

6
actions/tahoe-lafs
View File

@ -189,17 +189,19 @@ def subcommand_add_introducer(arguments):
Param introducer must be a tuple of (pet_name, furl). Param introducer must be a tuple of (pet_name, furl).
""" """
with YAMLFile(introducers_file, restart_storage_node) as conf: with YAMLFile(introducers_file) as conf:
pet_name, furl = arguments.introducer.split(",") pet_name, furl = arguments.introducer.split(",")
conf['introducers'][pet_name] = {'furl': furl} conf['introducers'][pet_name] = {'furl': furl}
restart_storage_node()
def subcommand_remove_introducer(arguments): def subcommand_remove_introducer(arguments):
"""Rename the introducer entry in the introducers.yaml file specified """Rename the introducer entry in the introducers.yaml file specified
by the param pet_name by the param pet_name
""" """
with YAMLFile(introducers_file, restart_storage_node) as conf: with YAMLFile(introducers_file) as conf:
del conf['introducers'][arguments.pet_name] del conf['introducers'][arguments.pet_name]
restart_storage_node()
def subcommand_get_introducers(_): def subcommand_get_introducers(_):

7
plinth/utils.py
View File

@ -89,16 +89,14 @@ def get_domain_names():
class YAMLFile(object): class YAMLFile(object):
"""A context management class for updating YAML files""" """A context management class for updating YAML files"""
def __init__(self, yaml_file, post_exit=None): def __init__(self, yaml_file):
"""Return a context object for the YAML file. """Return a context object for the YAML file.
Parameters: Parameters:
yaml_file - the YAML file to update. yaml_file - the YAML file to update.
post_exit - a function that will be called after
updating the YAML file. updating the YAML file.
""" """
self.yaml_file = yaml_file self.yaml_file = yaml_file
self.post_exit = post_exit
self.conf = None self.conf = None
def __enter__(self): def __enter__(self):
@ -114,9 +112,6 @@ class YAMLFile(object):
with open(self.yaml_file, 'w') as intro_conf: with open(self.yaml_file, 'w') as intro_conf:
ruamel.yaml.round_trip_dump(self.conf, intro_conf) ruamel.yaml.round_trip_dump(self.conf, intro_conf)
if self.post_exit:
self.post_exit()
def is_file_empty(self): def is_file_empty(self):
return os.stat(self.yaml_file).st_size == 0 return os.stat(self.yaml_file).st_size == 0