mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 15:02:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

require config.yml use UTF-8 as encoding

Browse source 
config.yml requires ASCII or UTF-8 encoding because this code does not
auto-detect the file's encoding.  That is left up to the YAML library.
YAML allows ASCII, UTF-8, UTF-16, and UTF-32 encodings.  Since it is a
good idea to manage config.yml (WITHOUT PASSWORDS!) in git, it makes
sense to use a globally standard encoding.
This commit is contained in:
Hans-Christoph Steiner 2021-06-14 16:00:45 +02:00
parent 48c4354629
commit 1f5534d060
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/common.py
View file

@ -336,6 +336,12 @@ def read_config(opts=None):
reading it. config.py is deprecated and supported for backwards
compatibility.
config.yml requires ASCII or UTF-8 encoding because this code does
not auto-detect the file's encoding. That is left up to the YAML
library. YAML allows ASCII, UTF-8, UTF-16, and UTF-32 encodings.
Since it is a good idea to manage config.yml (WITHOUT PASSWORDS!)
in git, it makes sense to use a globally standard encoding.
"""
global config, options
@ -354,7 +360,7 @@ def read_config(opts=None):
if os.path.exists(config_file):
logging.debug(_("Reading '{config_file}'").format(config_file=config_file))
with open(config_file) as fp:
with open(config_file, encoding='utf-8') as fp:
config = yaml.safe_load(fp)
elif os.path.exists(old_config_file):
logging.warning(_("""{oldfile} is deprecated, use {newfile}""")