nirum-lang
diff --git a/‎CHANGES.rst
Lines changed: 9 additions & 0 deletions b/‎CHANGES.rst
Lines changed: 9 additions & 0 deletions
diff --git a/‎nirum/rpc.py
Lines changed: 6 additions & 6 deletions b/‎nirum/rpc.py
Lines changed: 6 additions & 6 deletions
diff --git a/‎tests/rpc_test.py
Lines changed: 30 additions & 0 deletions b/‎tests/rpc_test.py
Lines changed: 30 additions & 0 deletions
@@ -6,6 +6,15 @@ Version 0.5.2
 
 To be released.
 
+- ``url`` of ``nirum.rpc.Client`` and
+  ``method`` of ``nirum.rpc.Client.make_request``
+  now can be both ``unicode`` and ``str`` on Python 2.7. [`#87`_]
+- ``nirum.rpc.Client`` had been an old-style class on Python 2, but now
+  it became a new-style class also on Python 2. (As Python 3 has only new-style
+  class, there's no change on Python 3.)
+
+.. _#87: https://github.com/spoqa/nirum-python/pull/87
+
 
 Version 0.5.1
 -------------
 
@@ -7,7 +7,7 @@
 import json
 import typing
 
-from six import integer_types, text_type
+from six import integer_types, string_types
 from six.moves import urllib
 from werkzeug.exceptions import HTTPException
 from werkzeug.http import HTTP_STATUS_CODES
@@ -313,7 +313,7 @@ def _raw_response(self, status_code, response_json, **kwargs):
         return WsgiResponse(content, status_code, headers, **kwargs)
 
 
-class Client:
+class Client(object):
 
     def __init__(self, url, opener=urllib.request.build_opener()):
         self.url = url_endswith_slash(url)
@@ -375,9 +375,9 @@ def do_request(self, request_url, payload):
                 repr(request_tuple)
             )
         http_method, request_url, headers, content = request_tuple
-        if not isinstance(request_url, text_type):
+        if not isinstance(request_url, string_types):
             raise TypeError(
-                '`request_url` have to be instance of text. not {}'.format(
+                '`request_url` have to be instance of string. not {}'.format(
                     typing._type_repr(type(request_url))
                 )
             )
@@ -393,9 +393,9 @@ def do_request(self, request_url, payload):
                     typing._type_repr(type(content))
                 )
             )
-        if not isinstance(http_method, text_type):
+        if not isinstance(http_method, string_types):
             raise TypeError(
-                '`method` have to be instance of text. not {}'.format(
+                '`method` have to be instance of string. not {}'.format(
                     typing._type_repr(type(http_method))
                 )
             )
 
@@ -54,6 +54,19 @@ class MusicServiceTypeErrorImpl(nf.MusicService):
     get_music_by_artist_name = 1
 
 
+class MethodClient(Client):
+
+    def __init__(self, method, url, opener):
+        self.method = method
+        super(MethodClient, self).__init__(url, opener)
+
+    def make_request(self, _, request_url, headers, payload):
+        return (
+            self.method, request_url, headers,
+            json.dumps(payload).encode('utf-8')
+        )
+
+
 @mark.parametrize('impl, error_class', [
     (MusicServiceNameErrorImpl, InvalidNirumServiceMethodNameError),
     (MusicServiceTypeErrorImpl, InvalidNirumServiceMethodTypeError),
@@ -336,6 +349,23 @@ def test_client_ping():
     assert client.ping()
 
 
+@mark.parametrize(
+    'url',
+    [u'http://foobar.com/rpc/', 'http://foobar.com/rpc/']
+)
+def test_client_url(url):
+    client = Client(url, MockOpener(url, MusicServiceImpl))
+    assert client.ping()
+
+
+@mark.parametrize('method', [u'POST', 'POST'])
+def test_client_make_request_method_type(method):
+    url = 'http://test.com'
+    client = MethodClient(method, url,
+                          MockOpener(url, MusicServiceImpl))
+    assert client.ping()
+
+
 @mark.parametrize('arity', [0, 1, 2, 3, 5])
 def test_client_make_request_arity_check(arity):
     class ExtendedClient(Client):
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`import json`
`8`	`8`	`import typing`
`9`	`9`
`10`		`-from six import integer_types, text_type`
	`10`	`+from six import integer_types, string_types`
`11`	`11`	`from six.moves import urllib`
`12`	`12`	`from werkzeug.exceptions import HTTPException`
`13`	`13`	`from werkzeug.http import HTTP_STATUS_CODES`
`@@ -313,7 +313,7 @@ def _raw_response(self, status_code, response_json, **kwargs):`
`313`	`313`	`return WsgiResponse(content, status_code, headers, **kwargs)`
`314`	`314`
`315`	`315`
`316`		`-class Client:`
	`316`	`+class Client(object):`
`317`	`317`
`318`	`318`	`def __init__(self, url, opener=urllib.request.build_opener()):`
`319`	`319`	`self.url = url_endswith_slash(url)`
`@@ -375,9 +375,9 @@ def do_request(self, request_url, payload):`
`375`	`375`	`repr(request_tuple)`
`376`	`376`	`)`
`377`	`377`	`http_method, request_url, headers, content = request_tuple`
`378`		`- if not isinstance(request_url, text_type):`
	`378`	`+ if not isinstance(request_url, string_types):`
`379`	`379`	`raise TypeError(`
`380`		- '`request_url` have to be instance of text. not {}'.format(
	`380`	+ '`request_url` have to be instance of string. not {}'.format(
`381`	`381`	`typing._type_repr(type(request_url))`
`382`	`382`	`)`
`383`	`383`	`)`
`@@ -393,9 +393,9 @@ def do_request(self, request_url, payload):`
`393`	`393`	`typing._type_repr(type(content))`
`394`	`394`	`)`
`395`	`395`	`)`
`396`		`- if not isinstance(http_method, text_type):`
	`396`	`+ if not isinstance(http_method, string_types):`
`397`	`397`	`raise TypeError(`
`398`		- '`method` have to be instance of text. not {}'.format(
	`398`	+ '`method` have to be instance of string. not {}'.format(
`399`	`399`	`typing._type_repr(type(http_method))`
`400`	`400`	`)`
`401`	`401`	`)`