Merge pull request #64 from SVilgelm/autoformat

Autoformat

Author: SVilgelm

marshmallow_objects/models.py

@@ -59,12 +59,10 @@ def __new__(mcs, name, parents, dct):
             for parent in parents:
                 if issubclass(parent, Model):
                     parent_schemas.append(parent.__schema_class__)
-        parent_schemas = (
-                parent_schemas
-                or [cls.__schema_class__ or marshmallow.Schema]
-        )
-        schema_class = type(
-            name + 'Schema', tuple(parent_schemas), schema_fields)
+        parent_schemas = (parent_schemas
+                          or [cls.__schema_class__ or marshmallow.Schema])
+        schema_class = type(name + 'Schema', tuple(parent_schemas),
+                            schema_fields)
         cls.__schema_class__ = schema_class
 
         return cls
@@ -102,13 +100,14 @@ def _deserialize(self, value, attr, data, **kwargs):
 
 def with_metaclass(meta, *bases):
     """Create a base class with a metaclass."""
+
     # This requires a bit of explanation: the basic idea is to make a dummy
     # metaclass for one level of class instantiation that replaces itself with
     # the actual metaclass.
     class metaclass(meta):  # noqa
-
         def __new__(cls, name, this_bases, d):
             return meta(name, bases, d)
+
     return type.__new__(metaclass, 'temporary_class', (), {})
 
 
@@ -197,8 +196,11 @@ def load_json(cls,
                   *args,
                   **kwargs):
         schema = cls.__get_schema_class__(context=context)
-        loaded = schema.loads(
-            data, many=many, partial=partial, *args, **kwargs)
+        loaded = schema.loads(data,
+                              many=many,
+                              partial=partial,
+                              *args,
+                              **kwargs)
         if MM2:
             return loaded[0]
         return loaded
@@ -314,5 +316,7 @@ def dump_many_yaml(data,
                    *args,
                    **kwargs):
     ret = dump_many(data, context)
-    return yaml.dump(
-        ret, default_flow_style=default_flow_style, *args, **kwargs)
+    return yaml.dump(ret,
+                     default_flow_style=default_flow_style,
+                     *args,
+                     **kwargs)

tests/test_models.py

@@ -84,15 +84,14 @@ def test_schema_name(self):
 
     def test_schema_class(self):
         assert issubclass(A.__schema_class__, marshmallow.Schema)
-        assert issubclass(
-            MultiInheritance.__schema_class__, marshmallow.Schema)
+        assert issubclass(MultiInheritance.__schema_class__,
+                          marshmallow.Schema)
 
     def test_model_class(self):
         assert issubclass(A.__schema_class__.__model_class__,
                           marshmallow.Model)
-        assert issubclass(
-            MultiInheritance.__schema_class__.__model_class__,
-            marshmallow.Model)
+        assert issubclass(MultiInheritance.__schema_class__.__model_class__,
+                          marshmallow.Model)
 
     def test_tag_processor(self):
         assert hasattr(A.__schema_class__, 'set_tag_field')
@@ -103,24 +102,21 @@ def test_meta(self):
         self.assertEqual(id(A.Meta), id(A.__schema_class__.Meta))
         assert not hasattr(B, 'Meta')
         assert hasattr(B.__schema_class__, 'Meta')
-        self.assertEqual(
-            id(MultiInheritance.Meta),
-            id(MultiInheritance.__schema_class__.Meta))
+        self.assertEqual(id(MultiInheritance.Meta),
+                         id(MultiInheritance.__schema_class__.Meta))
         assert hasattr(MultiInheritance.__schema_class__, 'Meta')
 
     def test_on_bind_filed(self):
-        self.assertEqual(
-            id(A.on_bind_field), id(A.__schema_class__.on_bind_field))
-        self.assertEqual(
-            id(MultiInheritance.on_bind_field),
-            id(MultiInheritance.__schema_class__.on_bind_field))
+        self.assertEqual(id(A.on_bind_field),
+                         id(A.__schema_class__.on_bind_field))
+        self.assertEqual(id(MultiInheritance.on_bind_field),
+                         id(MultiInheritance.__schema_class__.on_bind_field))
 
     def test_handle_error(self):
-        self.assertEqual(
-            id(A.handle_error), id(A.__schema_class__.handle_error))
-        self.assertEqual(
-            id(MultiInheritance.handle_error),
-            id(MultiInheritance.__schema_class__.handle_error))
+        self.assertEqual(id(A.handle_error),
+                         id(A.__schema_class__.handle_error))
+        self.assertEqual(id(MultiInheritance.handle_error),
+                         id(MultiInheritance.__schema_class__.handle_error))
 
 
 class TestModel(unittest.TestCase):
@@ -371,12 +367,11 @@ def test_load_many_as_one(self):
         self.assertRaises(marshmallow.ValidationError, B.load, self.data)
 
     def test_load_many_partial(self):
-        self.assertRaises(
-            marshmallow.ValidationError,
-            B.load,
-            data=[{}, {}],
-            many=True,
-            partial=False)
+        self.assertRaises(marshmallow.ValidationError,
+                          B.load,
+                          data=[{}, {}],
+                          many=True,
+                          partial=False)
         bb = B.load([{}, {}], many=True, partial=True)
         self.assertEqual(2, len(bb))
         for b in bb:
@@ -406,8 +401,9 @@ def test_dump_different_classes(self):
         self.assertEqual([self.data, adata], ddata)
 
     def test_dump_fake(self):
-        self.assertRaises(
-            marshmallow.ValidationError, marshmallow.dump_many, data='fake')
+        self.assertRaises(marshmallow.ValidationError,
+                          marshmallow.dump_many,
+                          data='fake')
 
     def test_dump_context(self):
         context = {'value': 'bar'}

tools/bump_version

@@ -5,10 +5,9 @@ import subprocess
 
 
 def exec_cmd(cmd, input=None):
-    p = subprocess.Popen(
-        cmd,
-        stdout=subprocess.PIPE,
-        stdin=(subprocess.PIPE if input else None))
+    p = subprocess.Popen(cmd,
+                         stdout=subprocess.PIPE,
+                         stdin=(subprocess.PIPE if input else None))
     stdout, _ = p.communicate(input and input.encode())
 
     return str(stdout, 'utf-8')
@@ -17,27 +16,22 @@ def exec_cmd(cmd, input=None):
 @contextlib.contextmanager
 def disable_show_signature():
     local_flag = exec_cmd(
-        ["git", "config", "--local", "--get", "log.showSignature"]
-    ).strip()
-    exec_cmd(
-        ["git", "config", "--local", "log.showSignature",
-         "false"]
-    )
+        ["git", "config", "--local", "--get", "log.showSignature"]).strip()
+    exec_cmd(["git", "config", "--local", "log.showSignature", "false"])
     yield
     if local_flag:
-        exec_cmd(
-            ["git", "config", "--local", "log.showSignature", local_flag]
-        )
+        exec_cmd(["git", "config", "--local", "log.showSignature", local_flag])
     else:
-        exec_cmd(
-            ["git", "config", "--local", "--unset", "log.showSignature"]
-        )
+        exec_cmd(["git", "config", "--local", "--unset", "log.showSignature"])
 
 
 def get_diff(tag):
-    return [l for l in exec_cmd([
-        "git", "log", "--pretty=%h %s", "--no-merges", "{}..HEAD".format(tag)
-    ]).splitlines() if not l.startswith("gpg")]
+    return [
+        l for l in exec_cmd([
+            "git", "log", "--pretty=%h %s", "--no-merges", "{}..HEAD".format(
+                tag)
+        ]).splitlines() if not l.startswith("gpg")
+    ]
 
 
 def get_last_tag():
@@ -61,15 +55,14 @@ def get_info(version):
     new_tag = version or str_tag(inc_tag(last_tag))
 
     subject = "Version {}".format(new_tag)
-    changes = '\n'.join(
-        '* {}'.format(line) for line in get_diff(str_tag(last_tag)))
+    changes = '\n'.join('* {}'.format(line)
+                        for line in get_diff(str_tag(last_tag)))
 
     annotation = """{subject}
 {sep}
 
 {changes}
-""".format(
-        subject=subject, sep='-' * len(subject), changes=changes)
+""".format(subject=subject, sep='-' * len(subject), changes=changes)
     return new_tag, annotation
 
 
@@ -131,21 +124,18 @@ if __name__ == '__main__':
     import argparse
 
     parser = argparse.ArgumentParser()
-    parser.add_argument(
-        'version',
-        nargs='?',
-        help="specify version, otherwise the current version "
-        "will be incremented by 1")
-    parser.add_argument(
-        '-s',
-        '--sign',
-        action='store_true',
-        help="sign a tag and commits")
-    parser.add_argument(
-        '-r',
-        '--dry-run',
-        action='store_true',
-        help="print tag's number and annotation")
+    parser.add_argument('version',
+                        nargs='?',
+                        help="specify version, otherwise the current version "
+                        "will be incremented by 1")
+    parser.add_argument('-s',
+                        '--sign',
+                        action='store_true',
+                        help="sign a tag and commits")
+    parser.add_argument('-r',
+                        '--dry-run',
+                        action='store_true',
+                        help="print tag's number and annotation")
 
     args = parser.parse_args()