Merge tag '0.1.1'

Author: dahlia

.gitignore

@@ -3,3 +3,5 @@
 .cache/
 .tox/
 __pycache__/
+build/
+dist/

.travis.yml

@@ -8,11 +8,23 @@ script:
 - tox
 - tox -e docs
 - '[[ "$TRAVIS_TAG" = "" ]] || [[ "$TRAVIS_TAG" = "$(python setup.py --version)" ]]'
+# Ensure changelog was written:
 - |
-    if git show --format=%B --quiet "$TRAVIS_COMMIT_RANGE$TRAVIS_TAG" | grep '\[changelog skip\]' > /dev/null; then
-      echo "Skip changelog checker..."
+    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+      curl -L http://github.com/micha/jsawk/raw/master/jsawk > /tmp/jsawk
+      chmod +x /tmp/jsawk
+      PR_BASE="$(curl -vf https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST.json \
+                 | jq --raw-output '.base.sha')"
+      CHANGE_RANGE="${PR_BASE}..${TRAVIS_PULL_REQUEST_SHA}"
     elif [[ "$TRAVIS_TAG" != "" ]]; then
-      ! grep -i "to be released" README.rst
+      CHANGE_RANGE="${TRAVIS_TAG}^1..${TRAVIS_TAG}"
+    else
+      CHANGE_RANGE="${TRAVIS_COMMIT_RANGE}"
+    fi
+    if git show --format=%B --quiet "$CHANGE_RANGE" \
+       | grep '\[changelog skip\]' > /dev/null; then
+      echo "Skip changelog checker..."
     else
-      [[ "$(git diff --name-only "$TRAVIS_COMMIT_RANGE" | grep CHANGES\.rst)" != "" ]]
+      git diff --name-only "$CHANGE_RANGE" | grep CHANGES.rst
     fi
+- '[[ "$TRAVIS_TAG" = "" ]] || ! grep -i "to be released" CHANGES.rst'

CHANGES.rst

@@ -7,6 +7,15 @@ Version 0.2.0
 To be released.
 
 
+Version 0.1.1
+-------------
+
+Released on August 3, 2017.
+
+- Fixed a bug that message of ``UnexpectedNirumResponseError`` was not a ``str``
+  but ``unicode`` in Python 2.
+
+
 Version 0.1.0
 -------------
 

nirum_http.py

@@ -45,5 +45,7 @@ def call(self,
         try:
             content = response.json()
         except ValueError:
-            raise UnexpectedNirumResponseError(response.text)
+            raise UnexpectedNirumResponseError(
+                response.content if isinstance('', bytes) else response.text
+            )
         return response.ok, content

test.py

@@ -1,8 +1,8 @@
-from pytest import fixture
+from pytest import fixture, raises
 from requests import Session
 from requests_mock import Adapter
 
-from nirum_http import HttpTransport
+from nirum_http import HttpTransport, UnexpectedNirumResponseError
 
 
 @fixture
@@ -34,3 +34,21 @@ def callback(request, context):
     )
     assert successful
     assert result == {'_type': 'point', 'x': 1.0, 'top': 2.0}
+
+
+def test_unexpected_nirum_response_error(fx_adapter, fx_session):
+    method_name = 'hello_world'
+    base_url = 'http://example.com/'
+    url = '{0}?method={1}'.format(base_url, method_name)
+    fx_adapter.register_uri('POST', url, text='Error message')
+    t = HttpTransport(base_url, session=fx_session)
+    with raises(UnexpectedNirumResponseError) as exc_info:
+        t.call(
+            method_name, payload={'name': 'John'},
+            service_annotations={},
+            method_annotations={},
+            parameter_annotations={}
+        )
+    exc = exc_info.value
+    assert exc.args == ('Error message',)
+    assert isinstance(exc.args[0], str)