diff --git a/capirca/lib/aclgenerator.py b/capirca/lib/aclgenerator.py index c387a7fa..4278adce 100644 --- a/capirca/lib/aclgenerator.py +++ b/capirca/lib/aclgenerator.py @@ -21,7 +21,6 @@ import string from capirca.lib import policy -import six import hashlib # generic error class diff --git a/capirca/lib/arista_tp.py b/capirca/lib/arista_tp.py index 0bd2b2e9..04378762 100644 --- a/capirca/lib/arista_tp.py +++ b/capirca/lib/arista_tp.py @@ -21,7 +21,6 @@ from absl import logging from capirca.lib import aclgenerator -import six # 1 2 3 # 123456789012345678901234567890123456789 diff --git a/capirca/lib/cloudarmor.py b/capirca/lib/cloudarmor.py index bc99aa65..2c2f6e64 100644 --- a/capirca/lib/cloudarmor.py +++ b/capirca/lib/cloudarmor.py @@ -11,8 +11,6 @@ from capirca.lib import aclgenerator -import six - # Generic error class class Error(Exception): @@ -253,6 +251,6 @@ def __str__(self): out = '%s\n\n' % ( json.dumps(self.cloudarmor_policies, indent=2, - separators=(six.ensure_str(','), six.ensure_str(': ')), + separators=(',', ': '), sort_keys=True)) return out diff --git a/capirca/lib/gce.py b/capirca/lib/gce.py index edd115fb..c9e0460b 100644 --- a/capirca/lib/gce.py +++ b/capirca/lib/gce.py @@ -30,7 +30,6 @@ from capirca.lib import gcp from capirca.lib import nacaddr -import six class Error(Exception): @@ -159,7 +158,7 @@ def __init__(self, term, inet_version='inet', policy_inet_version='inet'): def __str__(self): """Convert term to a string.""" json.dumps(self.ConvertToDict(), indent=2, - separators=(six.ensure_str(','), six.ensure_str(': '))) + separators=(',', ': ')) def _validateDirection(self): if self.term.direction == 'INGRESS': @@ -582,8 +581,7 @@ def _TranslatePolicy(self, pol, exp_info): def __str__(self): out = '%s\n\n' % (json.dumps(self.gce_policies, indent=2, - separators=(six.ensure_str(','), - six.ensure_str(': ')), + separators=(',', ': '), sort_keys=True)) return out diff --git a/capirca/lib/gce_vpc_tf.py b/capirca/lib/gce_vpc_tf.py index 00b45184..43d88b8e 100644 --- a/capirca/lib/gce_vpc_tf.py +++ b/capirca/lib/gce_vpc_tf.py @@ -29,7 +29,6 @@ from capirca.lib import gcp from capirca.lib import nacaddr -import six class Error(Exception): @@ -158,7 +157,7 @@ def __str__(self): json.dumps( self.ConvertToDict(priority_index=1), indent=2, - separators=(six.ensure_str(','), six.ensure_str(': '))) + separators=(',', ': ')) def _validateDirection(self): if self.term.direction == 'INGRESS': @@ -610,7 +609,7 @@ def __str__(self): json.dumps( self.resource_wrapper, indent=2, - separators=(six.ensure_str(','), six.ensure_str(': ')), + separators=(',', ': '), sort_keys=True)) return out diff --git a/capirca/lib/gcp.py b/capirca/lib/gcp.py index 3f7957a8..475ca267 100644 --- a/capirca/lib/gcp.py +++ b/capirca/lib/gcp.py @@ -9,8 +9,6 @@ from capirca.lib import aclgenerator -import six - class Error(Exception): """Generic error class.""" @@ -68,7 +66,7 @@ def __str__(self): json.dumps( self.policies, indent=2, - separators=(six.ensure_str(','), six.ensure_str(': ')), + separators=(',', ': '), sort_keys=True)) return out diff --git a/capirca/lib/juniper.py b/capirca/lib/juniper.py index 6f801a58..fbeebae7 100644 --- a/capirca/lib/juniper.py +++ b/capirca/lib/juniper.py @@ -20,7 +20,6 @@ from capirca.lib import aclgenerator from capirca.lib import nacaddr from capirca.lib import summarizer -import six # generic error class diff --git a/capirca/lib/junipermsmpc.py b/capirca/lib/junipermsmpc.py index bc297086..a293aaa4 100644 --- a/capirca/lib/junipermsmpc.py +++ b/capirca/lib/junipermsmpc.py @@ -20,7 +20,6 @@ from capirca.lib import aclgenerator from capirca.lib import juniper from capirca.lib import nacaddr -import six MAX_IDENTIFIER_LEN = 55 # It is really 63, but leaving room for added chars diff --git a/capirca/lib/junipersrx.py b/capirca/lib/junipersrx.py index 12701cac..3dd6c2c5 100644 --- a/capirca/lib/junipersrx.py +++ b/capirca/lib/junipersrx.py @@ -25,7 +25,6 @@ from absl import logging from capirca.lib import aclgenerator from capirca.lib import nacaddr -import six ICMP_TERM_LIMIT = 8 diff --git a/capirca/lib/nsxv.py b/capirca/lib/nsxv.py index be56eef2..aac81282 100644 --- a/capirca/lib/nsxv.py +++ b/capirca/lib/nsxv.py @@ -22,7 +22,6 @@ from absl import logging from capirca.lib import aclgenerator from capirca.lib import nacaddr -import six _ACTION_TABLE = { @@ -624,7 +623,7 @@ def __str__(self): target.append('-->') for (_, _, _, terms) in self.nsxv_policies: - section_name = six.ensure_str(self._FILTER_OPTIONS_DICT['section_name']) + section_name = str(self._FILTER_OPTIONS_DICT['section_name']) # check section id value section_id = self._FILTER_OPTIONS_DICT['section_id'] if not section_id or section_id == 0: diff --git a/capirca/lib/openconfig.py b/capirca/lib/openconfig.py index f35d26a0..e0e4429a 100644 --- a/capirca/lib/openconfig.py +++ b/capirca/lib/openconfig.py @@ -31,7 +31,6 @@ from capirca.lib import aclgenerator from capirca.lib import nacaddr from collections import defaultdict -import six class Error(Exception): @@ -262,8 +261,7 @@ def _TranslatePolicy(self, pol, exp_info): def __str__(self): out = '%s\n\n' % (json.dumps(self.oc_policies, indent=2, - separators=(six.ensure_str(','), - six.ensure_str(': ')), + separators=(',', ': '), sort_keys=True)) return out diff --git a/capirca/lib/policy_simple.py b/capirca/lib/policy_simple.py index 3e848130..b297963e 100644 --- a/capirca/lib/policy_simple.py +++ b/capirca/lib/policy_simple.py @@ -22,7 +22,6 @@ """ from absl import logging -import six class Field: diff --git a/capirca/lib/versa.py b/capirca/lib/versa.py index 0dc18a05..3238e5d6 100644 --- a/capirca/lib/versa.py +++ b/capirca/lib/versa.py @@ -25,7 +25,6 @@ from absl import logging from capirca.lib import aclgenerator from capirca.lib import nacaddr -#import six diff --git a/requirements.txt b/requirements.txt index 14b345de..696b3dcf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,4 @@ absl-py ply PyYAML -six>=1.12.0 typing_extensions diff --git a/setup.py b/setup.py index fbccd88c..f6a9eabc 100644 --- a/setup.py +++ b/setup.py @@ -52,8 +52,6 @@ install_requires=[ 'absl-py', 'ply', - 'mock', - 'six', 'PyYAML', ], python_requires='>=3.6',