Removed Python 2 compatibility bytes handling
Change-Id: Ic437b2e5f486dab7af3d662abc68cf239137c40a
This commit is contained in:
parent
f9a2494b2d
commit
604e10a570
|
@ -158,8 +158,6 @@ class TsigInfoMiddleware(DNSMiddleware):
|
|||
|
||||
try:
|
||||
name = request.keyname.to_text(True)
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
criterion = {'name': name}
|
||||
tsigkey = self.storage.find_tsigkey(
|
||||
context.get_current(), criterion
|
||||
|
|
|
@ -50,8 +50,6 @@ class TsigKeyring(dict):
|
|||
def get(self, key, default=None):
|
||||
try:
|
||||
name = key.to_text(True)
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
criterion = {'name': name}
|
||||
tsigkey = self.storage.find_tsigkey(
|
||||
context.get_current(), criterion
|
||||
|
@ -119,14 +117,9 @@ def from_dnspython_zone(dnspython_zone):
|
|||
if soa.ttl == 0:
|
||||
soa.ttl = CONF['service:central'].min_ttl
|
||||
email = soa[0].rname.to_text(omit_final_dot=True)
|
||||
if isinstance(email, bytes):
|
||||
email = email.decode('utf-8')
|
||||
email = email.replace('.', '@', 1)
|
||||
|
||||
name = dnspython_zone.origin.to_text()
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
|
||||
values = {
|
||||
'name': name,
|
||||
'email': email,
|
||||
|
@ -161,8 +154,6 @@ def dnspythonrecord_to_recordset(rname, rdataset):
|
|||
record_type = dns.rdatatype.to_text(rdataset.rdtype)
|
||||
|
||||
name = rname.to_text()
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
|
||||
# Create the other recordsets
|
||||
|
||||
|
|
|
@ -106,9 +106,6 @@ class RequestHandler:
|
|||
question = request.question[0]
|
||||
|
||||
name = question.name.to_text()
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
|
||||
criterion = {
|
||||
'name': name,
|
||||
'type': 'SECONDARY',
|
||||
|
@ -203,8 +200,6 @@ class RequestHandler:
|
|||
# validate the parameters
|
||||
try:
|
||||
name = q_rrset.name.to_text()
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
criterion = self._zone_criterion_from_request(
|
||||
request, {'name': name})
|
||||
zone = self.storage.find_zone(context, criterion)
|
||||
|
@ -302,8 +297,6 @@ class RequestHandler:
|
|||
try:
|
||||
q_rrset = request.question[0]
|
||||
name = q_rrset.name.to_text()
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
# TODO(vinod) once validation is separated from the api,
|
||||
# validate the parameters
|
||||
criterion = {
|
||||
|
|
|
@ -143,6 +143,4 @@ class NetworkAPI(DriverPlugin):
|
|||
Get the name for the address
|
||||
"""
|
||||
name = reversename.from_address(address).to_text()
|
||||
if isinstance(name, bytes):
|
||||
name = name.decode('utf-8')
|
||||
return name
|
||||
|
|
|
@ -103,18 +103,6 @@ class TestTsigInfoMiddleware(oslotest.base.BaseTestCase):
|
|||
mock.ANY, {'name': 'test'}
|
||||
)
|
||||
|
||||
def test_process_request_bytes(self):
|
||||
mock_context = mock.Mock()
|
||||
mock_request = mock.Mock()
|
||||
mock_request.keyname.to_text.return_value = b'test'
|
||||
mock_request.environ = {'context': mock_context}
|
||||
|
||||
self.assertIsNone(self.dns_middleware.process_request(mock_request))
|
||||
|
||||
self.storage.find_tsigkey.assert_called_with(
|
||||
mock.ANY, {'name': 'test'}
|
||||
)
|
||||
|
||||
def test_process_request_tsig_key_not_found(self):
|
||||
mock_context = mock.Mock()
|
||||
mock_request = mock.Mock()
|
||||
|
|
Loading…
Reference in New Issue