Merge pull request #146 from Weirdo914/issue/136

[dependencies] Update jsonschema to latest version #136

Author: nemesifier

netjsonconfig/__init__.py

@@ -1,11 +1,11 @@
-from pkg_resources import iter_entry_points
 import logging
 
-from .version import VERSION, __version__, get_version  # noqa
+from pkg_resources import iter_entry_points
 
-from .backends.openwrt.openwrt import OpenWrt  # noqa
-from .backends.openwisp.openwisp import OpenWisp  # noqa
 from .backends.openvpn.openvpn import OpenVpn  # noqa
+from .backends.openwisp.openwisp import OpenWisp  # noqa
+from .backends.openwrt.openwrt import OpenWrt  # noqa
+from .version import VERSION, __version__, get_version  # noqa
 
 
 def get_backends():

netjsonconfig/backends/base/backend.py

@@ -5,7 +5,7 @@
 from copy import deepcopy
 from io import BytesIO
 
-from jsonschema import FormatChecker, validate
+from jsonschema import Draft4Validator, draft4_format_checker
 from jsonschema.exceptions import ValidationError as JsonSchemaError
 
 from ...exceptions import ValidationError
@@ -109,7 +109,7 @@ def _render_files(self):
 
     def validate(self):
         try:
-            validate(self.config, self.schema, format_checker=FormatChecker())
+            Draft4Validator(self.schema, format_checker=draft4_format_checker).validate(self.config)
         except JsonSchemaError as e:
             raise ValidationError(e)
 

netjsonconfig/backends/openvpn/openvpn.py

@@ -1,6 +1,6 @@
-from . import converters
 from ...schema import DEFAULT_FILE_MODE
 from ..base.backend import BaseBackend
+from . import converters
 from .parser import OpenVpnParser, config_suffix, vpn_pattern
 from .renderer import OpenVpnRenderer
 from .schema import schema

netjsonconfig/backends/openwrt/converters/__init__.py

@@ -1,6 +1,6 @@
 from .default import Default
-from .interfaces import Interfaces
 from .general import General
+from .interfaces import Interfaces
 from .led import Led
 from .ntp import Ntp
 from .openvpn import OpenVpn

netjsonconfig/backends/openwrt/converters/radios.py

@@ -26,7 +26,7 @@ def __intermediate_radio(self, radio):
         # determine hwmode option
         radio['hwmode'] = self.__intermediate_hwmode(radio)
         # check if using channel 0, that means "auto"
-        if radio['channel'] is 0:
+        if radio['channel'] == 0:
             radio['channel'] = 'auto'
         # determine channel width
         if radio['type'] == 'mac80211':
@@ -45,7 +45,7 @@ def __intermediate_hwmode(self, radio):
             # return 11a, 11b or 11g
             return protocol[4:]
         # determine hwmode depending on channel used
-        if radio['channel'] is 0:
+        if radio['channel'] == 0:
             # when using automatic channel selection, we need an
             # additional parameter to determine the frequency band
             return radio.get('hwmode')

netjsonconfig/backends/openwrt/openwrt.py

@@ -1,5 +1,5 @@
-from . import converters
 from ..base.backend import BaseBackend
+from . import converters
 from .parser import OpenWrtParser, config_path, packages_pattern
 from .renderer import OpenWrtRenderer
 from .schema import schema

netjsonconfig/utils.py

@@ -110,14 +110,14 @@ def evaluate_vars(data, context=None):
 
 
 def get_copy(dict_, key, default=None):
-        """
-        Looks for a key in a dictionary, if found returns
-        a deepcopied value, otherwise returns default value
-        """
-        value = dict_.get(key, default)
-        if value:
-            return deepcopy(value)
-        return value
+    """
+    Looks for a key in a dictionary, if found returns
+    a deepcopied value, otherwise returns default value
+    """
+    value = dict_.get(key, default)
+    if value:
+        return deepcopy(value)
+    return value
 
 
 class _TabsMixin(object):  # pragma: nocover

requirements.txt

@@ -1,3 +1,3 @@
 jinja2>=2.9,<3.0
-jsonschema>=2.6,<2.7
+jsonschema>=3.0,<3.3
 six

tests/test_exceptions.py

@@ -1,6 +1,6 @@
 import unittest
 
-from jsonschema import ValidationError, validate
+from jsonschema import Draft4Validator, ValidationError
 
 from netjsonconfig import OpenWrt
 from netjsonconfig.exceptions import _list_errors
@@ -45,6 +45,9 @@
 }
 
 
+validate = Draft4Validator(schema).validate
+
+
 class TestJsonSchema(unittest.TestCase):
     """
     tests ValidationError helpers