python2 is no longer supported so let's drop six as well.

Change-Id: I2fef470423765a9c432d33e56edf93d08254b5c9
changes/44/810944/1 13.1.0
Alex Schultz 1 year ago
parent 52fab1e297
commit 474068e487

@ -16,8 +16,6 @@
import grp
import pwd
import six
from os_apply_config import config_exception as exc
@ -33,10 +31,10 @@ class OacFile(object):
super(OacFile, self).__init__()
self.body = body
for k, v in six.iteritems(self.DEFAULTS):
for k, v in self.DEFAULTS.items():
setattr(self, '_' + k, v)
for k, v in six.iteritems(kwargs):
for k, v in kwargs.items():
if not hasattr(self, k):
raise exc.ConfigException(
"unrecognised file control key '%s'" % (k))
@ -52,7 +50,7 @@ class OacFile(object):
def __repr__(self):
a = ["OacFile(%s" % repr(self.body)]
for key, default in six.iteritems(self.DEFAULTS):
for key, default in self.DEFAULTS.items():
value = getattr(self, key)
if value != default:
a.append("%s=%s" % (key, repr(value)))

@ -5,4 +5,3 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
pystache>=0.5.4 # MIT
PyYAML>=3.12 # MIT
six>=1.10.0 # MIT

Loading…
Cancel
Save