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

Use ruamel.yaml in metadata.py and metadata.TestCase

Browse source 
This is to read metadata based on YAML 1.2 rather than 1.1.
This commit is contained in:
FestplattenSchnitzel 2021-12-29 12:07:45 +01:00
parent 8c10614bf9
commit 671a264dfe
No known key found for this signature in database
GPG key ID: 1B4181FC97673B9D
3 changed files with 60 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

23
fdroidserver/metadata.py
View file

@ -23,14 +23,11 @@ from pathlib import Path
import platform
import re
import logging
import yaml
try:
from yaml import CSafeLoader as SafeLoader
except ImportError:
from yaml import SafeLoader
import importlib
from collections import OrderedDict
from ruamel.yaml import YAML, YAMLError
from . import common
from . import _
from .exception import MetaDataException, FDroidException
@ -483,18 +480,19 @@ def parse_yaml_srclib(metadatapath):
with metadatapath.open("r", encoding="utf-8") as f:
try:
data = yaml.load(f, Loader=SafeLoader)
yaml = YAML(typ='safe')
data = yaml.load(f)
if type(data) is not dict:
if platform.system() == 'Windows':
# Handle symlink on Windows
symlink = metadatapath.parent / metadatapath.read_text(encoding='utf-8')
if symlink.is_file():
with symlink.open("r", encoding="utf-8") as s:
data = yaml.load(s, Loader=SafeLoader)
data = yaml.load(s)
if type(data) is not dict:
raise yaml.error.YAMLError(_('{file} is blank or corrupt!')
.format(file=metadatapath))
except yaml.error.YAMLError as e:
raise YAMLError(_('{file} is blank or corrupt!')
.format(file=metadatapath))
except YAMLError as e:
_warn_or_exception(_("Invalid srclib metadata: could not "
"parse '{file}'")
.format(file=metadatapath) + '\n'
@ -797,8 +795,9 @@ def parse_yaml_metadata(mf, app):
"""
try:
yamldata = yaml.load(mf, Loader=SafeLoader)
except yaml.YAMLError as e:
yaml = YAML(typ='safe')
yamldata = yaml.load(mf)
except YAMLError as e:
_warn_or_exception(_("could not parse '{path}'")
.format(path=mf.name) + '\n'
+ common.run_yamllint(mf.name, indent=4),