From d08c2ea3d76e8a2fa5379e3d4b50139a7c79bfea Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 7 Jul 2016 12:48:52 +0100 Subject: [PATCH 1/3] Include util functions --- hal_codec/__init__.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/hal_codec/__init__.py b/hal_codec/__init__.py index cc3796e..6b5bd29 100644 --- a/hal_codec/__init__.py +++ b/hal_codec/__init__.py @@ -1,5 +1,5 @@ from collections import OrderedDict -from coreapi.codecs.base import BaseCodec, _get_string, _get_dict, _get_bool +from coreapi.codecs.base import BaseCodec from coreapi.compat import force_bytes, urlparse from coreapi.compat import COMPACT_SEPARATORS, VERBOSE_SEPARATORS from coreapi.document import Document, Link, Array, Object, Field, Error @@ -8,7 +8,28 @@ import uritemplate -__version__ = "0.0.2" +__version__ = "0.0.3" + + +def _get_string(item, key): + value = item.get(key) + if isinstance(value, string_types): + return value + return '' + + +def _get_dict(item, key): + value = item.get(key) + if isinstance(value, dict): + return value + return {} + + +def _get_bool(item, key): + value = item.get(key) + if isinstance(value, bool): + return value + return False def _is_array_containing_instance(value, datatype): From 4c59874a4d700103309a072e4cac23e8623fad5d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 7 Jul 2016 13:07:20 +0100 Subject: [PATCH 2/3] Add missing import --- hal_codec/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal_codec/__init__.py b/hal_codec/__init__.py index 6b5bd29..e6c81fa 100644 --- a/hal_codec/__init__.py +++ b/hal_codec/__init__.py @@ -1,6 +1,6 @@ from collections import OrderedDict from coreapi.codecs.base import BaseCodec -from coreapi.compat import force_bytes, urlparse +from coreapi.compat import force_bytes, string_types, urlparse from coreapi.compat import COMPACT_SEPARATORS, VERBOSE_SEPARATORS from coreapi.document import Document, Link, Array, Object, Field, Error from coreapi.exceptions import ParseError From 245c4b11e66d450dfdc99578da197ffaff3fc1cf Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 7 Jul 2016 13:13:07 +0100 Subject: [PATCH 3/3] Fix plugin installation --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 955b39d..5eb1a05 100755 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ def get_package_data(package): ], entry_points={ 'coreapi.codecs': [ - 'hal=hal_codec.HALCodec', + 'hal=hal_codec:HALCodec', ] } )