Merge pull request #111 from pawelplsi/master

[requirements] Stop using six compatibility library

Author: nemesifier

django_netjsongraph/api/parsers.py

@@ -1,4 +1,3 @@
-import six
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from rest_framework.exceptions import ParseError
@@ -18,4 +17,4 @@ def parse(self, stream, media_type=None, parser_context=None):
         try:
             return stream.read().decode(encoding)
         except ValidationError as e:  # pragma: nocover
-            raise ParseError('text/plain parse error - %s' % six.text_type(e))
+            raise ParseError('text/plain parse error - %s' % str(e))

django_netjsongraph/tests/base/test_link.py

@@ -1,4 +1,3 @@
-import six
 from django.core.exceptions import ValidationError
 
 from ...utils import link_status_changed
@@ -54,7 +53,7 @@ def test_json(self):
                 'status_changed': link.status_changed,
             }
         })
-        self.assertIsInstance(link.json(), six.string_types)
+        self.assertIsInstance(link.json(), str)
 
     def test_get_from_nodes(self):
         t = self.topology_model.objects.first()

django_netjsongraph/tests/base/test_node.py

@@ -1,6 +1,3 @@
-import six
-
-
 class TestNodeMixin(object):
     def test_str(self):
         n = self.node_model(addresses=['192.168.0.1'], label='test node')
@@ -62,7 +59,7 @@ def test_json(self):
                 'modified': n.modified
             }
         })
-        self.assertIsInstance(n.json(), six.string_types)
+        self.assertIsInstance(n.json(), str)
 
     def test_get_from_address(self):
         t = self.topology_model.objects.first()

django_netjsongraph/tests/base/test_topology.py

@@ -1,7 +1,6 @@
 from datetime import timedelta
 
 import responses
-import six
 from django.core.exceptions import ValidationError
 from freezegun import freeze_time
 from netdiff import OlsrParser
@@ -80,7 +79,7 @@ def test_json(self):
                 dict(l2.json(dict=True))
             ]
         })
-        self.assertIsInstance(t.json(), six.string_types)
+        self.assertIsInstance(t.json(), str)
 
     @responses.activate
     def test_empty_diff(self):

setup.cfg

@@ -2,7 +2,7 @@
 universal=1
 
 [isort]
-known_third_party = six,django,netdiff
+known_third_party = django,netdiff
 default_section = THIRDPARTY
 
 [flake8]