fix not working code because webargs upgrade

Author: TTWShell

Pipfile

@@ -8,6 +8,7 @@ tox = "*"
 ipython = "*"
 cx-Oracle = "*"
 zipp = {extras = ["hobbit", "hobbit_core"], path = "."}
+hobbit-core = {extras = ["hobbit", "hobbit_core"], version = "==2.0.0"}
 
 [dev-packages]
 sphinx = "==2.0.1"

hobbit_core/schemas.py

@@ -30,7 +30,7 @@ def create_user(username, password):
     """
 
     @post_load()
-    def make_instance(self, data):
+    def make_instance(self, data, many, **kwargs):
         return data
 
 
@@ -101,7 +101,7 @@ class EnumSetMeta(SQLAlchemyAutoSchemaMeta):
     def gen_func(cls, decorator, field_name, enum, verbose=True):
 
         @decorator
-        def wrapper(self, data):
+        def wrapper(self, data, many, **kwargs):
             if data.get(field_name) is None:
                 return data
 

hobbit_core/utils.py

@@ -110,19 +110,20 @@ def _get_init_args(instance, base_class):
     """Get instance's __init__ args and it's value when __call__.
     """
     getargspec = inspect.getfullargspec
-
     argspec = getargspec(base_class.__init__)
-    no_defaults = argspec.args[:-len(argspec.defaults)]
-    has_defaults = argspec.args[-len(argspec.defaults):]
-
-    kwargs = {k: getattr(instance, k) for k in no_defaults
-              if k != 'self' and hasattr(instance, k)}
-    kwargs.update({k: getattr(instance, k) if hasattr(instance, k) else
-                   getattr(instance, k, argspec.defaults[i])
-                   for i, k in enumerate(has_defaults)})
-
-    assert len(kwargs) == len(argspec.args) - 1, 'exclude `self`'
 
+    defaults = argspec.defaults
+    kwargs = {}
+    if defaults is not None:
+        no_defaults = argspec.args[:-len(defaults)]
+        has_defaults = argspec.args[-len(defaults):]
+
+        kwargs = {k: getattr(instance, k) for k in no_defaults
+                  if k != 'self' and hasattr(instance, k)}
+        kwargs.update({k: getattr(instance, k) if hasattr(instance, k) else
+                      getattr(instance, k, defaults[i])
+                      for i, k in enumerate(has_defaults)})
+        assert len(kwargs) == len(argspec.args) - 1, 'exclude `self`'
     return kwargs
 
 

hobbit_core/webargs.py

@@ -1,13 +1,24 @@
+from collections.abc import Mapping
+
 from webargs.flaskparser import FlaskParser
 
 
+def strip_whitespace(value):
+    if isinstance(value, str):
+        value = value.strip()
+    # you'll be getting a MultiDictProxy here potentially, but it should work
+    elif isinstance(value, Mapping):
+        return {k: strip_whitespace(value[k]) for k in value}
+    elif isinstance(value, (list, set)):
+        return type(value)(map(strip_whitespace, value))
+    return value
+
+
 class CustomParser(FlaskParser):
 
-    def parse_arg(self, name, field, req, locations=None):
-        ret = super().parse_arg(name, field, req, locations=locations)
-        if hasattr(ret, 'strip'):
-            return ret.strip()
-        return ret
+    def _load_location_data(self, **kwargs):
+        data = super()._load_location_data(**kwargs)
+        return strip_whitespace(data)
 
 
 parser = CustomParser()

tests/conftest.py

@@ -63,22 +63,26 @@ def session(request):
 class MockRequestParser(Parser):
     """A minimal parser implementation that parses mock requests."""
 
-    def parse_querystring(self, req, schema):
-        return self.load_json(req, schema)
+    def load_querystring(self, req, schema):
+        return req.query
 
-    def parse_json(self, req, schema):
-        return self.load_json(req, schema)
 
-    def parse_cookies(self, req, schema):
-        return self.load_json(req, schema)
+@pytest.fixture
+def request_context(app):
+    """create the app and return the request context as a fixture
+       so that this process does not need to be repeated in each test
+    """
+    return app.test_request_context
 
 
 @pytest.yield_fixture(scope="function")
-def web_request():
-    req = mock.Mock()
-    req.query = {}
-    yield req
-    req.query = {}
+def web_request(request_context):
+    with request_context():
+        from flask import request
+        req = request  # mock.Mock()
+        req.query = {}
+        yield req
+        req.query = {}
 
 
 @pytest.fixture

tests/importsub/schemas.py

@@ -6,7 +6,7 @@
 ma = Marshmallow()
 
 
-class UserSchema(ma.ModelSchema):  # type: ignore
+class UserSchema(ma.SQLAlchemyAutoSchema):  # type: ignore
 
     class Meta:
         from .models import OtherUser

tests/test_pagination.py

@@ -13,17 +13,17 @@ class TestPagination(BaseTest):
 
     def test_page_params(self, web_request, parser):
         # test default
-        @parser.use_kwargs(PageParams, web_request, locations=('query', ))
+        @parser.use_kwargs(PageParams, web_request, location='query')
         def viewfunc(page, page_size, order_by):
             return {'page': page, 'page_size': page_size, 'order_by': order_by}
 
         assert viewfunc() == {'order_by': ['-id'], 'page': 1, 'page_size': 10}
 
         # test page_size_range
         web_request.query = {'page_size': 101}
-        msg = r".*page_size': .*Must be between 5 and 100.*"
+        msg = r".*page_size': .*Must be greater than or equal to 5 and less than or equal to 100.*"
         with pytest.raises(ValidationError, match=msg):
-            viewfunc()
+            print(viewfunc())
 
         # test order_by
         web_request.query = {'order_by': 'id,-11'}

tests/test_schemas.py

@@ -15,9 +15,12 @@ def test_model_schema(self, client):
 
         class UserSchema(ModelSchema):
             role = EnumField(RoleEnum)
+            pass
 
             class Meta:
                 model = User
+                include_relationships = True
+                load_instance = True
 
         assert UserSchema.Meta.dateformat == '%Y-%m-%d %H:%M:%S'
 
@@ -26,6 +29,7 @@ class Meta:
         db.session.commit()
 
         data = UserSchema().dump(user)
+        print(data)
         assert data['role'] == {'key': 1, 'label': 'admin', 'value': '管理员'}
 
         class UserSchema(ModelSchema):