Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/pyff/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from datetime import datetime, timedelta
from json import dumps
from typing import Any, Optional
from urllib.parse import quote_plus
from urllib.parse import quote

import pyramid.httpexceptions as exc
import pytz
Expand Down Expand Up @@ -395,7 +395,7 @@ def _links(url: str, title: Any = None) -> None:
aliases = request.registry.aliases
for a in aliases.keys():
for v in request.registry.md.store.attribute(aliases[a]):
_links(f'{a}/{quote_plus(v)}')
_links(f"{a}/{quote(v, safe='')}")

response = Response(dumps(jrd, default=json_serializer))
response.headers['Content-Type'] = 'application/json'
Expand Down
5 changes: 3 additions & 2 deletions src/pyff/builtins.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""

import base64
import functools
import hashlib
import ipaddress
import json
Expand All @@ -16,7 +17,7 @@
from datetime import datetime
from io import BytesIO
from typing import Optional
from urllib.parse import quote_plus, urlparse
from urllib.parse import quote, urlparse

import pybergshamra
from pyuppsala import etree
Expand Down Expand Up @@ -552,7 +553,7 @@ def _nop(x):

enc = _nop
if req.args.get('urlencode_filenames'):
enc = quote_plus
enc = functools.partial(quote, safe='')

if output_file is None:
return req.t
Expand Down
2 changes: 1 addition & 1 deletion src/pyff/samlmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ def set_entity_attributes(e, d, nf=NF_URI):

def set_pubinfo(e, publisher=None, creation_instant=None):
if e.tag != "{{{}}}EntitiesDescriptor".format(NS['md']):
raise MetadataException("I can only set RegistrationAuthority to EntitiesDescriptor elements")
raise MetadataException("I can only set PublicationInfo to EntitiesDescriptor elements")
if publisher is None:
raise MetadataException("At least publisher must be provided")

Expand Down
Loading