Skip to content

Fix Edm.Binary literal representation #186

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

Merged
filak-sap merged 1 commit into from
Jan 11, 2022
Merged

Fix Edm.Binary literal representation #186

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion pyodata/v2/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
# pylint: disable=missing-docstring,too-many-instance-attributes,too-many-arguments,protected-access,no-member,line-too-long,logging-format-interpolation,too-few-public-methods,too-many-lines, too-many-public-methods

import base64
import collections
import datetime
from enum import Enum, auto
Expand Down Expand Up @@ -194,7 +195,7 @@ def _build_types():
Types.Types = {}

Types.register_type(Typ('Null', 'null'))
Types.register_type(Typ('Edm.Binary', 'binary\'\''))
Types.register_type(Typ('Edm.Binary', 'binary\'\'', EdmBinaryTypTraits('(?:binary|X)')))
Types.register_type(Typ('Edm.Boolean', 'false', EdmBooleanTypTraits()))
Types.register_type(Typ('Edm.Byte', '0'))
Types.register_type(Typ('Edm.DateTime', 'datetime\'2000-01-01T00:00\'', EdmDateTimeTypTraits()))
Expand Down Expand Up @@ -361,6 +362,18 @@ def from_literal(self, value):
return matches.group(1)


class EdmBinaryTypTraits(EdmPrefixedTypTraits):
"""Edm.Binary traits"""

def to_literal(self, value):
binary = base64.b64decode(value, validate=True)
return f"binary'{base64.b16encode(binary).decode()}'"

def from_literal(self, value):
binary = base64.b16decode(super().from_literal(value), casefold=True)
return base64.b64encode(binary).decode()


class EdmDateTimeTypTraits(EdmPrefixedTypTraits):
"""Emd.DateTime traits

Expand Down
17 changes: 13 additions & 4 deletions tests/test_model_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,19 @@ def test_traits():
"""Test individual traits"""

# generic
typ = Types.from_name('Edm.Binary')
typ = Types.from_name('Edm.Byte')
assert repr(typ.traits) == 'TypTraits'
assert typ.traits.to_literal('bincontent') == 'bincontent'
assert typ.traits.from_literal('some bin content') == 'some bin content'
assert typ.traits.to_literal('85') == '85'
assert typ.traits.from_literal('170') == '170'

# binary
typ = Types.from_name('Edm.Binary')
assert repr(typ.traits) == 'EdmBinaryTypTraits'
assert typ.traits.to_literal('wAHK/rqt8A0=') == 'binary\'C001CAFEBAADF00D\''
assert typ.traits.from_literal('binary\'C001cafeBAADF00D\'') == 'wAHK/rqt8A0='
assert typ.traits.from_literal('X\'C001cafeBAADF00D\'') == 'wAHK/rqt8A0='
assert typ.traits.to_json('cHlvZGF0YQ==') == 'cHlvZGF0YQ=='
assert typ.traits.from_json('cHlvZGF0YQ==') == 'cHlvZGF0YQ=='

# string
typ = Types.from_name('Edm.String')
Expand Down Expand Up @@ -1462,4 +1471,4 @@ def test_invalid_xml(xml_builder_factory):

with pytest.raises(PyODataParserError) as e_info:
MetadataBuilder(xml).build()
assert str(e_info.value) == 'Metadata document syntax error'
assert str(e_info.value) == 'Metadata document syntax error'