diff options
author | Nicholas Car <nick@kurrawong.net> | 2020-03-16 08:48:31 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-16 08:48:31 +1000 |
commit | fcb9733684afad7383e6a9fa053e042d2d10b2eb (patch) | |
tree | 6c27b8873b13fa06cb393bd2d3d1d9e31fb2d400 /rdflib | |
parent | 0e5efef78702575e4abff4d8076eac4e2bd9d5f0 (diff) | |
parent | 45b906bd69793c1040f97a2ee4a547776f532880 (diff) | |
download | rdflib-fcb9733684afad7383e6a9fa053e042d2d10b2eb.tar.gz |
Merge pull request #929 from gordom6/master
Fix for issue #923, Result.parse with content_type that includes a ;charset=
Diffstat (limited to 'rdflib')
-rw-r--r-- | rdflib/query.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rdflib/query.py b/rdflib/query.py index 25d82b2e..3f14e8c0 100644 --- a/rdflib/query.py +++ b/rdflib/query.py @@ -200,7 +200,15 @@ class Result(object): @staticmethod def parse(source=None, format=None, content_type=None, **kwargs): from rdflib import plugin - parser = plugin.get(format or content_type or 'xml', ResultParser)() + + if format: + plugin_key = format + elif content_type: + plugin_key = content_type.split(";", 1)[0] + else: + plugin_key = 'xml' + + parser = plugin.get(plugin_key, ResultParser)() return parser.parse(source, content_type=content_type, **kwargs) |