Commit 4ae8812f authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Remove six module, python 2.7 is no longer supported

parent 93aee469
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
import configparser
import os
import six
import json
import logging
from glob import glob
from os.path import join
from six.moves import configparser
from collections import Sequence, Mapping
from ..util.context_managers import suppress

+1 −2
Original line number Diff line number Diff line
import six
from .context_managers import suppress
from importlib import import_module
from collections import Sequence
@@ -80,7 +79,7 @@ class Network(set):
	def _add(self, network):
		if isinstance(network, Network):
			self.update(network)
		elif isinstance(network, six.string_types):
		elif isinstance(network, str):
			self.add(net_factory(network))
		elif isinstance(network, Sequence):
			self.update(net_factory(n) for n in network)
+0 −1
Original line number Diff line number Diff line
@@ -32,6 +32,5 @@ setup(
		'django-widget-tweaks~=1.4',
		'html5lib>=1',
		'passlib~=1.6',
		'six~=1.10',
	],
)