Merge branch 'maintenance-0.5' into maintenance-0.6

Author: dahlia

nirum/datastructures.py

@@ -53,26 +53,26 @@ def __repr__(self):
 
 class List(collections.Sequence):
 
-    def __init__(self, l):
-        self.l = l
+    def __init__(self, items):
+        self.items = items
 
     def __getitem__(self, index):
-        return self.l[index]
+        return self.items[index]
 
     def __len__(self):
-        return len(self.l)
+        return len(self.items)
 
     def __contains__(self, item):
-        return item in self.l
+        return item in self.items
 
     def __iter__(self):
-        return iter(self.l)
+        return iter(self.items)
 
     def index(self, item):
-        return self.l.index(item)
+        return self.items.index(item)
 
     def count(self, item):
-        return self.l.count(item)
+        return self.items.count(item)
 
 
 map_type = Map

nirum/service.py

@@ -5,8 +5,8 @@
 import typing
 
 from .constructs import NameDict
-from .exc import (InvalidNirumServiceMethodTypeError,
-                  InvalidNirumServiceMethodNameError)
+from .exc import (InvalidNirumServiceMethodNameError,
+                  InvalidNirumServiceMethodTypeError)
 
 __all__ = 'Service',
 

setup.py

@@ -42,7 +42,7 @@ def get_version():
     'pytest >= 3.1.2, < 4.0.0',
     'pytest-flake8 >= 0.8.1, < 1.0.0',
     'flake8-import-order >= 0.12, < 1.0',
-    'flake8-import-order-spoqa >= 1.0.0, < 2.0.0',
+    'flake8-import-order-spoqa >= 1.0.1, < 2.0.0',
 ]
 docs_require = [
     'Sphinx',

tests/deserialize_test.py

@@ -5,14 +5,17 @@
 import typing
 import uuid
 
-from pytest import raises, mark
+from pytest import mark, raises
 from six import PY3, text_type
 
 from nirum._compat import utc
-from nirum.deserialize import (deserialize_unboxed_type, deserialize_meta,
+from nirum.deserialize import (deserialize_meta,
+                               deserialize_optional,
+                               deserialize_primitive,
+                               deserialize_record_type,
                                deserialize_tuple_type,
-                               deserialize_record_type, deserialize_union_type,
-                               deserialize_optional, deserialize_primitive)
+                               deserialize_unboxed_type,
+                               deserialize_union_type)
 from nirum.serialize import serialize_record_type
 
 

tests/rpc_test.py

@@ -1,9 +1,9 @@
 import json
 
 from fixture import BadRequest, MusicService, Unknown
-from pytest import fixture, raises, mark
+from pytest import fixture, mark, raises
 from six import text_type
-from werkzeug.test import Client as TestClient
+from werkzeug.test import Client as WTestClient
 from werkzeug.wrappers import Response
 
 from nirum.deserialize import deserialize_meta
@@ -59,7 +59,7 @@ def fx_music_wsgi():
 
 @fixture
 def fx_test_client(fx_music_wsgi):
-    return TestClient(fx_music_wsgi, Response)
+    return WTestClient(fx_music_wsgi, Response)
 
 
 def test_wsgi_app_ping(fx_music_wsgi, fx_test_client):
@@ -247,7 +247,7 @@ class ExtendedWsgiApp(WsgiApp):
         def make_response(self, status_code, headers, content):
             return (status_code, headers, content, None)[:arity]
     wsgi_app = ExtendedWsgiApp(MusicServiceImpl())
-    client = TestClient(wsgi_app, Response)
+    client = WTestClient(wsgi_app, Response)
     with raises(TypeError) as e:
         client.post('/?method=get_music_by_artist_name',
                     data=json.dumps({'artist_name': u'damien rice'}))

tests/serialize_test.py

@@ -7,8 +7,8 @@
 
 from nirum._compat import utc
 from nirum.datastructures import List
-from nirum.serialize import (serialize_unboxed_type, serialize_record_type,
-                             serialize_meta, serialize_union_type)
+from nirum.serialize import (serialize_meta, serialize_record_type,
+                             serialize_unboxed_type, serialize_union_type)
 
 
 def test_serialize_unboxed_type(fx_offset, fx_token_type):

tests/service_test.py

@@ -1,8 +1,8 @@
 from fixture import MusicService
 from pytest import mark, raises
 
-from nirum.exc import (InvalidNirumServiceMethodTypeError,
-                       InvalidNirumServiceMethodNameError)
+from nirum.exc import (InvalidNirumServiceMethodNameError,
+                       InvalidNirumServiceMethodTypeError)
 
 
 class MusicServiceNameErrorImpl(MusicService):

tests/validate_test.py

@@ -5,8 +5,8 @@
 from six import text_type
 
 from nirum.datastructures import List
-from nirum.validate import (validate_unboxed_type, validate_record_type,
-                            validate_union_type, validate_type)
+from nirum.validate import (validate_record_type, validate_type,
+                            validate_unboxed_type, validate_union_type)
 
 
 def test_validate_unboxed_type():

tox.ini

@@ -3,6 +3,10 @@ envlist = buildfixture,{py27,py34,py35,py36}-{typing351,typing352},docs
 
 [testenv]
 deps =
+    ; FIXME: the following command should be removed when
+    ; https://github.com/tholo/pytest-flake8/pull/35 is merged:
+    git+git://github.com/jezdez/[email protected]
+
     -e.[tests]
     typing351: typing<3.5.2
     typing352: typing>=3.5.2