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

Soften the language tag constraint #167

Merged
merged 2 commits into from
Nov 16, 2023
Merged

Soften the language tag constraint #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da5b52b
Soften the language tag constraint
zrgt Nov 15, 2023
cb9cbf9
Update test_language_tag_constraints
zrgt Nov 15, 2023
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
10 changes: 4 additions & 6 deletions basyx/aas/model/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,10 @@ def __init__(self, dict_: Dict[str, str]):
@classmethod
def _check_language_tag_constraints(cls, ltag: str):
split = ltag.split("-", 1)
if len(split[0]) != 2 or not split[0].isalpha() or not split[0].islower():
raise ValueError(f"The language code '{split[0]}' of the language tag '{ltag}' doesn't consist of exactly "
"two lower-case letters!")
if len(split) > 1 and (len(split[1]) != 2 or not split[1].isalpha() or not split[1].isupper()):
raise ValueError(f"The extension '{split[1]}' of the language tag '{ltag}' doesn't consist of exactly "
"two upper-case letters!")
lang_code = split[0]
if len(lang_code) != 2 or not lang_code.isalpha() or not lang_code.islower():
raise ValueError(f"The language code of the language tag must consist of exactly two lower-case letters! "
f"Given language tag and language code: '{ltag}', '{lang_code}'")

def __getitem__(self, item: str) -> str:
return self._dict[item]
Expand Down
13 changes: 4 additions & 9 deletions test/model/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,19 +1230,14 @@ class LangStringSetTest(unittest.TestCase):
def test_language_tag_constraints(self) -> None:
with self.assertRaises(ValueError) as cm:
model.LangStringSet({"foo": "bar"})
self.assertEqual("The language code 'foo' of the language tag 'foo' doesn't consist of exactly "
"two lower-case letters!", str(cm.exception))
with self.assertRaises(ValueError) as cm:
model.LangStringSet({"fo-OO-bar": "bar"})
self.assertEqual("The extension 'OO-bar' of the language tag 'fo-OO-bar' doesn't consist of exactly "
"two upper-case letters!", str(cm.exception))
model.LangStringSet({"fo": "bar"})
self.assertEqual("The language code of the language tag must consist of exactly two lower-case letters! "
"Given language tag and language code: 'foo', 'foo'", str(cm.exception))

lss = model.LangStringSet({"fo-OO": "bar"})
with self.assertRaises(ValueError) as cm:
lss["foo"] = "bar"
self.assertEqual("The language code 'foo' of the language tag 'foo' doesn't consist of exactly "
"two lower-case letters!", str(cm.exception))
self.assertEqual("The language code of the language tag must consist of exactly two lower-case letters! "
"Given language tag and language code: 'foo', 'foo'", str(cm.exception))
self.assertNotIn("foo", lss)
self.assertNotIn("fo", lss)
lss["fo"] = "bar"
Expand Down