apply black and add makefile support

Author: platinummonkey

Makefile

@@ -1,6 +1,27 @@
 .PHONY: clean-pyc ext-test test upload-docs docs coverage
 
-all: clean test coverage
+all: clean black test coverage
+
+black:
+	black -v -l 150 --include wiremock/*.py
+	black -v -l 150 --include wiremock/base/*.py
+	black -v -l 150 --include wiremock/exceptions/*.py
+	black -v -l 150 --include wiremock/resources/*.py
+	black -v -l 150 --include wiremock/resources/mappings/*.py
+	black -v -l 150 --include wiremock/resources/near_misses/*.py
+	black -v -l 150 --include wiremock/resources/requests/*.py
+	black -v -l 150 --include wiremock/resources/scenarios/*.py
+	black -v -l 150 --include wiremock/resources/settings/*.py
+	black -v -l 150 --include wiremock/server/*.py
+	black -v -l 150 --include wiremock/tests/*.py
+	black -v -l 150 --include wiremock/tests/base_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/mappings_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/near_misses_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/requests_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/scenarios_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/settings_tests/*.py
+	black -v -l 150 --include wiremock/tests/server_tests/*.py
 
 test:
 	bash run_tests.sh

wiremock/_compat.py

@@ -8,37 +8,39 @@ def with_metaclass(meta, *bases):
     # metaclass for one level of class instantiation that replaces itself with
     # the actual metaclass.
     class metaclass(type):
-
         def __new__(cls, name, this_bases, d):
             if sys.version_info[:2] >= (3, 7):
                 # This version introduced PEP 560 that requires a bit
                 # of extra care (we mimic what is done by __build_class__).
                 resolved_bases = types.resolve_bases(bases)
                 if resolved_bases is not bases:
-                    d['__orig_bases__'] = bases
+                    d["__orig_bases__"] = bases
             else:
                 resolved_bases = bases
             return meta(name, resolved_bases, d)
 
         @classmethod
         def __prepare__(cls, name, this_bases):
             return meta.__prepare__(name, bases)
-    return type.__new__(metaclass, 'temporary_class', (), {})
+
+    return type.__new__(metaclass, "temporary_class", (), {})
 
 
 def add_metaclass(metaclass):
     """Class decorator for creating a class with a metaclass."""
+
     def wrapper(cls):
         orig_vars = cls.__dict__.copy()
-        slots = orig_vars.get('__slots__')
+        slots = orig_vars.get("__slots__")
         if slots is not None:
             if isinstance(slots, str):
                 slots = [slots]
             for slots_var in slots:
                 orig_vars.pop(slots_var)
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        if hasattr(cls, '__qualname__'):
-            orig_vars['__qualname__'] = cls.__qualname__
+        orig_vars.pop("__dict__", None)
+        orig_vars.pop("__weakref__", None)
+        if hasattr(cls, "__qualname__"):
+            orig_vars["__qualname__"] = cls.__qualname__
         return metaclass(cls.__name__, cls.__bases__, orig_vars)
+
     return wrapper

wiremock/base/base_entity.py

@@ -30,9 +30,7 @@ class JsonProperty(object):
 
     value_container = JsonPropertyValueContainer
 
-    def __init__(self, json_name, property_name=None,
-                 klass=None, list_klass=None, dict_key_klass=None, dict_value_klass=None,
-                 include_if_null=False):
+    def __init__(self, json_name, property_name=None, klass=None, list_klass=None, dict_key_klass=None, dict_value_klass=None, include_if_null=False):
         self._json_name = json_name
         self._property_name = property_name
         self._klass = klass
@@ -267,7 +265,7 @@ def __new__(mcs, name, bases, body):
         prop_dict = OrderedDict()
 
         for base in bases:
-            for k, v in getattr(base, '_properties', {}).items():
+            for k, v in getattr(base, "_properties", {}).items():
                 prop_dict.setdefault(k, v)
 
         def _transform_property(prop_name, prop_obj):
@@ -290,7 +288,7 @@ def _transform_property(prop_name, prop_obj):
                 raise EntityModelException("%s defines the json property %s more than once" % (name, v.json_name))
             json_names.add(v.json_name)
 
-        body['_properties'] = prop_dict
+        body["_properties"] = prop_dict
 
         # Create the class
         klass = super(BaseEntityMetaType, mcs).__new__(mcs, name, bases, body)
@@ -324,7 +322,7 @@ class BaseEntity(BaseAbstractEntity):
     _id = None
 
     def __init__(self, **values):
-        self._id = values.pop('id', None)
+        self._id = values.pop("id", None)
         super(BaseEntity, self).__init__(**values)
 
     @property
@@ -375,9 +373,8 @@ def get_json_data(self):
             if item is not None or prop.include_if_null:
                 result[prop.json_name] = item
         if self.id is not None:
-            result['id'] = self.id
+            result["id"] = self.id
         return result
 
 
-__all__ = ['BaseEntity', 'BaseAbstractEntity', 'BaseEntityMetaType', 'collection_to_json', 'EntityModelException',
-           'JsonProperty']
+__all__ = ["BaseEntity", "BaseAbstractEntity", "BaseEntityMetaType", "collection_to_json", "EntityModelException", "JsonProperty"]