Decode xlink:href attributes when reading METS #51
Conversation
| 'validate', | ||
| 'xsd_error_log_string', | ||
| 'xsd_validate', | ||
| ] |
There was a problem hiding this comment.
Learning a bit about this recently, this seems like good practice.
| except ValueError: | ||
| raise exceptions.MetsError( | ||
| 'Value "{}" (for attribute xlink:href) is not a valid' | ||
| ' URL.'.format(self.path)) |
There was a problem hiding this comment.
This seems sensible too.
| except ValueError: | ||
| raise exceptions.MetsError( | ||
| 'Value "{}" (for attribute xlink:href) is not a valid' | ||
| ' URL.'.format(self.target)) |
There was a problem hiding this comment.
If I read this correctly, MetsError is the base exception for the module. ParseError is the exception that might normally be raised when reading a METS file. I think this is fine, but something like MetsEncodeError might read clearer for exceptions where we're encoding data. I think I prefer the verb-y-ness so I think it's just a preference thing.
metsrw/utils.py
Outdated
| @@ -1,5 +1,5 @@ | |||
| # -*- coding: utf-8 -*- | |||
| from six.moves.urllib.parse import quote_plus, urlparse, urlunparse | |||
| from six.moves.urllib.parse import quote_plus, unquote_plus, urlparse, urlunparse | |||
There was a problem hiding this comment.
I think this just creeps over the line-length limit.
| """Decode percent encoding introduced per RFC3986 | ||
| https://tools.ietf.org/html/rfc3986#section-2.1. | ||
| """ | ||
| return _urlendecode(url, unquote_plus) |
| assert url == metsrw.urldecode(metsrw.urlencode(url)) | ||
| for url in BAD_URLS: | ||
| with pytest.raises(ValueError): | ||
| metsrw.urlencode(url) |
There was a problem hiding this comment.
There are useful tests to have. Thanks for adding them Joel.
A previous commit introduced URL-encoding of xlink:href values when writing METS. This commit introduces the corresponding URL-decoding when reading METS. Also adds some simple tests to display and confirm expected behaviour.
jrwdunham
force-pushed
the
dev/issue-206-url-decode-xlink-href
branch
from
d4280dc
to
35c2579
Compare
A previous commit introduced URL-encoding of xlink:href values when writing METS. This commit introduces the corresponding URL-decoding when reading METS. Also adds some simple tests to display and confirm expected behaviour.
Connected to archivematica/Issues#206