summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Waldon <brian@waldon.cc>2016-06-25 11:04:19 -0700
committerBrian Waldon <brian@waldon.cc>2016-06-25 11:04:19 -0700
commita2d0041ace5f1800e0e512022bec2dd527cc5d41 (patch)
tree1dcf662cf6b72e6c207bfe3923e259f3c11f04fe
parentb7b22e5972efde8ea32990f6853dd7d6db05f11f (diff)
downloadwarlock-a2d0041ace5f1800e0e512022bec2dd527cc5d41.tar.gz
flake8 compliance
-rw-r--r--test/test_core.py11
-rw-r--r--warlock/__init__.py5
-rw-r--r--warlock/model.py4
3 files changed, 11 insertions, 9 deletions
diff --git a/test/test_core.py b/test/test_core.py
index 90983de..51c0426 100644
--- a/test/test_core.py
+++ b/test/test_core.py
@@ -53,7 +53,7 @@ parent_fixture = {
child_fixture = {
'name': 'Child',
'properties': {
- 'age': {'type':'integer'},
+ 'age': {'type': 'integer'},
'mother': {'type': 'object'}
},
'required': ['age', 'mother']
@@ -258,11 +258,14 @@ class TestCore(unittest.TestCase):
def test_resolver(self):
from jsonschema import RefResolver
- schemas_path = 'file://' + os.path.join(os.path.dirname(__file__), 'schemas/')
+ dirname = os.path.dirname(__file__)
+ schemas_path = 'file://' + os.path.join(dirname, 'schemas/')
resolver = RefResolver(schemas_path, None)
- country_schema_file = open(os.path.join(os.path.dirname(__file__), 'schemas/') + 'country.json')
- person_schema_file = open(os.path.join(os.path.dirname(__file__), 'schemas/') + 'person.json')
+ country_schema_file = \
+ open(os.path.join(dirname, 'schemas/') + 'country.json')
+ person_schema_file = \
+ open(os.path.join(dirname, 'schemas/') + 'person.json')
country_schema = json.load(country_schema_file)
person_schema = json.load(person_schema_file)
diff --git a/warlock/__init__.py b/warlock/__init__.py
index b7c8627..966b75d 100644
--- a/warlock/__init__.py
+++ b/warlock/__init__.py
@@ -14,6 +14,5 @@
"""Public-facing Warlock API"""
-# pylint: disable=W0611
-from warlock.core import model_factory
-from warlock.exceptions import InvalidOperation
+from warlock.core import model_factory # NOQA
+from warlock.exceptions import InvalidOperation # NOQA
diff --git a/warlock/model.py b/warlock/model.py
index 1fe2606..233b753 100644
--- a/warlock/model.py
+++ b/warlock/model.py
@@ -78,7 +78,7 @@ class Model(dict):
def __delattr__(self, key):
self.__delitem__(key)
- ### BEGIN dict compatibility methods ###
+ # BEGIN dict compatibility methods
def clear(self):
raise exceptions.InvalidOperation()
@@ -119,7 +119,7 @@ class Model(dict):
def values(self):
return copy.deepcopy(dict(self)).values()
- ### END dict compatibility methods ###
+ # END dict compatibility methods
@property
def patch(self):