Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: always parse HexTuple files as utf-8 #2070

Merged
merged 1 commit into from
Aug 7, 2022
Merged

fix: always parse HexTuple files as utf-8 #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,22 @@ and will be removed for release.
<!-- -->
<!-- -->


<!-- -->
<!-- -->
<!-- CHANGE BARRIER: START PR #2070 -->
<!-- -->
<!-- -->

- Always parse HexTuple files as utf-8.
[PR #2070](https://github.com/RDFLib/rdflib/pull/2070).

<!-- -->
<!-- -->
<!-- CHANGE BARRIER: END PR #2070 -->
<!-- -->
<!-- -->

<!-- -->
<!-- -->
<!-- CHANGE BARRIER: START -->
Expand Down
2 changes: 1 addition & 1 deletion rdflib/plugins/parsers/hext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def parse(self, source, graph, **kwargs):

# handle different source types - only file and string (data) for now
if hasattr(source, "file"):
with open(source.file.name) as fp:
with open(source.file.name, encoding="utf-8") as fp:
for l in fp:
self._parse_hextuple(cg, self._load_json_line(l))
elif hasattr(source, "_InputSource__bytefile"):
Expand Down
11 changes: 0 additions & 11 deletions test/test_graph/test_variants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import logging
import os
import re
import sys
from dataclasses import dataclass, field
from pathlib import Path, PurePath
from test.data import TEST_DATA_DIR
Expand Down Expand Up @@ -192,16 +191,6 @@ def for_directory(
),
}

if sys.platform == "win32":
EXPECTED_FAILURES["variants/diverse_triples"] = pytest.mark.xfail(
reason="""
Some encoding issue when parsing hext on windows:
> return codecs.charmap_decode(input,self.errors,decoding_table)[0]
E UnicodeDecodeError: 'charmap' codec can't decode byte 0x81 in position 356: character maps to <undefined>
""",
raises=UnicodeDecodeError,
)


def tests_found() -> None:
logging.debug("VARIANTS_DIR = %s", VARIANTS_DIR)
Expand Down