Lots of text_type

octodns/provider/ovh.py

@@ -9,6 +9,7 @@ import base64
 import binascii
 import logging
 from collections import defaultdict
+from six import text_type
 
 import ovh
 from ovh import ResourceNotFoundError
@@ -64,7 +65,7 @@ class OvhProvider(BaseProvider):
             records = self.get_records(zone_name=zone_name)
             exists = True
         except ResourceNotFoundError as e:
-            if e.message != self.ZONE_NOT_FOUND_MESSAGE:
+            if text_type(e) != self.ZONE_NOT_FOUND_MESSAGE:
                 raise
             exists = False
             records = []

octodns/provider/plan.py

@@ -124,7 +124,7 @@ class PlanLogger(_PlanOutput):
                 buf.write('* ')
                 buf.write(target.id)
                 buf.write(' (')
-                buf.write(target)
+                buf.write(text_type(target))
                 buf.write(')\n*   ')
 
                 if plan.exists is False:
@@ -137,7 +137,7 @@ class PlanLogger(_PlanOutput):
                     buf.write('\n*   ')
 
                 buf.write('Summary: ')
-                buf.write(plan)
+                buf.write(text_type(plan))
                 buf.write('\n')
         else:
             buf.write(hr)

tests/test_octodns_manager.py

@@ -7,6 +7,7 @@ from __future__ import absolute_import, division, print_function, \
 
 from os import environ
 from os.path import dirname, join
+from six import text_type
 from unittest import TestCase
 
 from octodns.record import Record
@@ -29,78 +30,79 @@ class TestManager(TestCase):
     def test_missing_provider_class(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('missing-provider-class.yaml')).sync()
-        self.assertTrue('missing class' in ctx.exception.message)
+        self.assertTrue('missing class' in text_type(ctx.exception))
 
     def test_bad_provider_class(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('bad-provider-class.yaml')).sync()
-        self.assertTrue('Unknown provider class' in ctx.exception.message)
+        self.assertTrue('Unknown provider class' in text_type(ctx.exception))
 
     def test_bad_provider_class_module(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('bad-provider-class-module.yaml')) \
                 .sync()
-        self.assertTrue('Unknown provider class' in ctx.exception.message)
+        self.assertTrue('Unknown provider class' in text_type(ctx.exception))
 
     def test_bad_provider_class_no_module(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('bad-provider-class-no-module.yaml')) \
                 .sync()
-        self.assertTrue('Unknown provider class' in ctx.exception.message)
+        self.assertTrue('Unknown provider class' in text_type(ctx.exception))
 
     def test_missing_provider_config(self):
         # Missing provider config
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('missing-provider-config.yaml')).sync()
-        self.assertTrue('provider config' in ctx.exception.message)
+        self.assertTrue('provider config' in text_type(ctx.exception))
 
     def test_missing_env_config(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('missing-provider-env.yaml')).sync()
-        self.assertTrue('missing env var' in ctx.exception.message)
+        self.assertTrue('missing env var' in text_type(ctx.exception))
 
     def test_missing_source(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('unknown-provider.yaml')) \
                 .sync(['missing.sources.'])
-        self.assertTrue('missing sources' in ctx.exception.message)
+        self.assertTrue('missing sources' in text_type(ctx.exception))
 
     def test_missing_targets(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('unknown-provider.yaml')) \
                 .sync(['missing.targets.'])
-        self.assertTrue('missing targets' in ctx.exception.message)
+        self.assertTrue('missing targets' in text_type(ctx.exception))
 
     def test_unknown_source(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('unknown-provider.yaml')) \
                 .sync(['unknown.source.'])
-        self.assertTrue('unknown source' in ctx.exception.message)
+        self.assertTrue('unknown source' in text_type(ctx.exception))
 
     def test_unknown_target(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('unknown-provider.yaml')) \
                 .sync(['unknown.target.'])
-        self.assertTrue('unknown target' in ctx.exception.message)
+        self.assertTrue('unknown target' in text_type(ctx.exception))
 
     def test_bad_plan_output_class(self):
         with self.assertRaises(Exception) as ctx:
             name = 'bad-plan-output-missing-class.yaml'
             Manager(get_config_filename(name)).sync()
         self.assertEquals('plan_output bad is missing class',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
     def test_bad_plan_output_config(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('bad-plan-output-config.yaml')).sync()
         self.assertEqual('Incorrect plan_output config for bad',
-                         ctx.exception.message)
+                         text_type(ctx.exception))
 
     def test_source_only_as_a_target(self):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('unknown-provider.yaml')) \
                 .sync(['not.targetable.'])
-        self.assertTrue('does not support targeting' in ctx.exception.message)
+        self.assertTrue('does not support targeting' in
+                        text_type(ctx.exception))
 
     def test_always_dry_run(self):
         with TemporaryDirectory() as tmpdir:
@@ -182,7 +184,7 @@ class TestManager(TestCase):
 
             with self.assertRaises(Exception) as ctx:
                 manager.compare(['nope'], ['dump'], 'unit.tests.')
-            self.assertEquals('Unknown source: nope', ctx.exception.message)
+            self.assertEquals('Unknown source: nope', text_type(ctx.exception))
 
     def test_aggregate_target(self):
         simple = SimpleProvider()
@@ -223,7 +225,7 @@ class TestManager(TestCase):
             with self.assertRaises(Exception) as ctx:
                 manager.dump('unit.tests.', tmpdir.dirname, False, False,
                              'nope')
-            self.assertEquals('Unknown source: nope', ctx.exception.message)
+            self.assertEquals('Unknown source: nope', text_type(ctx.exception))
 
             manager.dump('unit.tests.', tmpdir.dirname, False, False, 'in')
 
@@ -252,7 +254,7 @@ class TestManager(TestCase):
             with self.assertRaises(Exception) as ctx:
                 manager.dump('unit.tests.', tmpdir.dirname, False, True,
                              'nope')
-            self.assertEquals('Unknown source: nope', ctx.exception.message)
+            self.assertEquals('Unknown source: nope', text_type(ctx.exception))
 
             manager.dump('unit.tests.', tmpdir.dirname, False, True, 'in')
 
@@ -268,12 +270,12 @@ class TestManager(TestCase):
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('missing-sources.yaml')) \
                 .validate_configs()
-        self.assertTrue('missing sources' in ctx.exception.message)
+        self.assertTrue('missing sources' in text_type(ctx.exception))
 
         with self.assertRaises(Exception) as ctx:
             Manager(get_config_filename('unknown-provider.yaml')) \
                 .validate_configs()
-        self.assertTrue('unknown source' in ctx.exception.message)
+        self.assertTrue('unknown source' in text_type(ctx.exception))
 
 
 class TestMainThreadExecutor(TestCase):

tests/test_octodns_plan.py

@@ -7,6 +7,7 @@ from __future__ import absolute_import, division, print_function, \
 
 from StringIO import StringIO
 from logging import getLogger
+from six import text_type
 from unittest import TestCase
 
 from octodns.provider.plan import Plan, PlanHtml, PlanLogger, PlanMarkdown
@@ -59,7 +60,7 @@ class TestPlanLogger(TestCase):
         with self.assertRaises(Exception) as ctx:
             PlanLogger('invalid', 'not-a-level')
         self.assertEquals('Unsupported level: not-a-level',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
     def test_create(self):
 

tests/test_octodns_provider_base.py

@@ -6,9 +6,8 @@ from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
 from logging import getLogger
-from unittest import TestCase
-
 from six import text_type
+from unittest import TestCase
 
 from octodns.record import Create, Delete, Record, Update
 from octodns.provider.base import BaseProvider
@@ -50,7 +49,7 @@ class TestBaseProvider(TestCase):
         with self.assertRaises(NotImplementedError) as ctx:
             BaseProvider('base')
         self.assertEquals('Abstract base class, log property missing',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
         class HasLog(BaseProvider):
             log = getLogger('HasLog')
@@ -58,7 +57,7 @@ class TestBaseProvider(TestCase):
         with self.assertRaises(NotImplementedError) as ctx:
             HasLog('haslog')
         self.assertEquals('Abstract base class, SUPPORTS_GEO property missing',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
         class HasSupportsGeo(HasLog):
             SUPPORTS_GEO = False
@@ -67,14 +66,14 @@ class TestBaseProvider(TestCase):
         with self.assertRaises(NotImplementedError) as ctx:
             HasSupportsGeo('hassupportsgeo').populate(zone)
         self.assertEquals('Abstract base class, SUPPORTS property missing',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
         class HasSupports(HasSupportsGeo):
             SUPPORTS = set(('A',))
         with self.assertRaises(NotImplementedError) as ctx:
             HasSupports('hassupports').populate(zone)
         self.assertEquals('Abstract base class, populate method missing',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
         # SUPPORTS_DYNAMIC has a default/fallback
         self.assertFalse(HasSupports('hassupports').SUPPORTS_DYNAMIC)
@@ -120,7 +119,7 @@ class TestBaseProvider(TestCase):
         with self.assertRaises(NotImplementedError) as ctx:
             HasPopulate('haspopulate').apply(plan)
         self.assertEquals('Abstract base class, _apply method missing',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
     def test_plan(self):
         ignored = Zone('unit.tests.', [])
@@ -240,7 +239,7 @@ class TestBaseProvider(TestCase):
         with self.assertRaises(UnsafePlan) as ctx:
             Plan(zone, zone, changes, True).raise_if_unsafe()
 
-        self.assertTrue('Too many updates' in ctx.exception.message)
+        self.assertTrue('Too many updates' in text_type(ctx.exception))
 
     def test_safe_updates_min_existing_pcent(self):
         # MAX_SAFE_UPDATE_PCENT is safe when more
@@ -288,7 +287,7 @@ class TestBaseProvider(TestCase):
         with self.assertRaises(UnsafePlan) as ctx:
             Plan(zone, zone, changes, True).raise_if_unsafe()
 
-        self.assertTrue('Too many deletes' in ctx.exception.message)
+        self.assertTrue('Too many deletes' in text_type(ctx.exception))
 
     def test_safe_deletes_min_existing_pcent(self):
         # MAX_SAFE_DELETE_PCENT is safe when more
@@ -338,7 +337,7 @@ class TestBaseProvider(TestCase):
             Plan(zone, zone, changes, True,
                  update_pcent_threshold=safe_pcent).raise_if_unsafe()
 
-        self.assertTrue('Too many updates' in ctx.exception.message)
+        self.assertTrue('Too many updates' in text_type(ctx.exception))
 
     def test_safe_deletes_min_existing_override(self):
         safe_pcent = .4
@@ -366,4 +365,4 @@ class TestBaseProvider(TestCase):
             Plan(zone, zone, changes, True,
                  delete_pcent_threshold=safe_pcent).raise_if_unsafe()
 
-        self.assertTrue('Too many deletes' in ctx.exception.message)
+        self.assertTrue('Too many deletes' in text_type(ctx.exception))

tests/test_octodns_provider_cloudflare.py

@@ -9,6 +9,7 @@ from mock import Mock, call
 from os.path import dirname, join
 from requests import HTTPError
 from requests_mock import ANY, mock as requests_mock
+from six import text_type
 from unittest import TestCase
 
 from octodns.record import Record, Update
@@ -65,7 +66,7 @@ class TestCloudflareProvider(TestCase):
                 provider.populate(zone)
 
             self.assertEquals('CloudflareError', type(ctx.exception).__name__)
-            self.assertEquals('request was invalid', ctx.exception.message)
+            self.assertEquals('request was invalid', text_type(ctx.exception))
 
         # Bad auth
         with requests_mock() as mock:
@@ -80,7 +81,7 @@ class TestCloudflareProvider(TestCase):
             self.assertEquals('CloudflareAuthenticationError',
                               type(ctx.exception).__name__)
             self.assertEquals('Unknown X-Auth-Key or X-Auth-Email',
-                              ctx.exception.message)
+                              text_type(ctx.exception))
 
         # Bad auth, unknown resp
         with requests_mock() as mock:
@@ -91,7 +92,7 @@ class TestCloudflareProvider(TestCase):
                 provider.populate(zone)
             self.assertEquals('CloudflareAuthenticationError',
                               type(ctx.exception).__name__)
-            self.assertEquals('Cloudflare error', ctx.exception.message)
+            self.assertEquals('Cloudflare error', text_type(ctx.exception))
 
         # General error
         with requests_mock() as mock:

tests/test_octodns_provider_digitalocean.py

@@ -10,6 +10,7 @@ from mock import Mock, call
 from os.path import dirname, join
 from requests import HTTPError
 from requests_mock import ANY, mock as requests_mock
+from six import text_type
 from unittest import TestCase
 
 from octodns.record import Record
@@ -50,7 +51,7 @@ class TestDigitalOceanProvider(TestCase):
             with self.assertRaises(Exception) as ctx:
                 zone = Zone('unit.tests.', [])
                 provider.populate(zone)
-            self.assertEquals('Unauthorized', ctx.exception.message)
+            self.assertEquals('Unauthorized', text_type(ctx.exception))
 
         # General error
         with requests_mock() as mock:

tests/test_octodns_provider_dnsimple.py

@@ -9,6 +9,7 @@ from mock import Mock, call
 from os.path import dirname, join
 from requests import HTTPError
 from requests_mock import ANY, mock as requests_mock
+from six import text_type
 from unittest import TestCase
 
 from octodns.record import Record
@@ -47,7 +48,7 @@ class TestDnsimpleProvider(TestCase):
             with self.assertRaises(Exception) as ctx:
                 zone = Zone('unit.tests.', [])
                 provider.populate(zone)
-            self.assertEquals('Unauthorized', ctx.exception.message)
+            self.assertEquals('Unauthorized', text_type(ctx.exception))
 
         # General error
         with requests_mock() as mock:

tests/test_octodns_provider_dnsmadeeasy.py

@@ -10,6 +10,7 @@ from mock import Mock, call
 from os.path import dirname, join
 from requests import HTTPError
 from requests_mock import ANY, mock as requests_mock
+from six import text_type
 from unittest import TestCase
 
 from octodns.record import Record
@@ -65,7 +66,7 @@ class TestDnsMadeEasyProvider(TestCase):
             with self.assertRaises(Exception) as ctx:
                 zone = Zone('unit.tests.', [])
                 provider.populate(zone)
-            self.assertEquals('Unauthorized', ctx.exception.message)
+            self.assertEquals('Unauthorized', text_type(ctx.exception))
 
         # Bad request
         with requests_mock() as mock:
@@ -76,7 +77,7 @@ class TestDnsMadeEasyProvider(TestCase):
                 zone = Zone('unit.tests.', [])
                 provider.populate(zone)
             self.assertEquals('\n  - Rate limit exceeded',
-                              ctx.exception.message)
+                              text_type(ctx.exception))
 
         # General error
         with requests_mock() as mock:

tests/test_octodns_provider_mythicbeasts.py

@@ -8,6 +8,7 @@ from __future__ import absolute_import, division, print_function, \
 from os.path import dirname, join
 
 from requests_mock import ANY, mock as requests_mock
+from six import text_type
 from unittest import TestCase
 
 from octodns.provider.mythicbeasts import MythicBeastsProvider, \
@@ -31,12 +32,12 @@ class TestMythicBeastsProvider(TestCase):
         with self.assertRaises(AssertionError) as err:
             add_trailing_dot('unit.tests.')
         self.assertEquals('Value already has trailing dot',
-                          err.exception.message)
+                          text_type(err.exception))
 
         with self.assertRaises(AssertionError) as err:
             remove_trailing_dot('unit.tests')
         self.assertEquals('Value already missing trailing dot',
-                          err.exception.message)
+                          text_type(err.exception))
 
         self.assertEquals(add_trailing_dot('unit.tests'), 'unit.tests.')
         self.assertEquals(remove_trailing_dot('unit.tests.'), 'unit.tests')
@@ -91,7 +92,7 @@ class TestMythicBeastsProvider(TestCase):
                 {'raw_values': [{'value': '', 'ttl': 0}]}
             )
         self.assertEquals('Unable to parse MX data',
-                          err.exception.message)
+                          text_type(err.exception))
 
     def test_data_for_CNAME(self):
         test_data = {
@@ -129,7 +130,7 @@ class TestMythicBeastsProvider(TestCase):
                 {'raw_values': [{'value': '', 'ttl': 0}]}
             )
         self.assertEquals('Unable to parse SRV data',
-                          err.exception.message)
+                          text_type(err.exception))
 
     def test_data_for_SSHFP(self):
         test_data = {
@@ -149,7 +150,7 @@ class TestMythicBeastsProvider(TestCase):
                 {'raw_values': [{'value': '', 'ttl': 0}]}
             )
         self.assertEquals('Unable to parse SSHFP data',
-                          err.exception.message)
+                          text_type(err.exception))
 
     def test_data_for_CAA(self):
         test_data = {
@@ -166,7 +167,7 @@ class TestMythicBeastsProvider(TestCase):
                 {'raw_values': [{'value': '', 'ttl': 0}]}
             )
         self.assertEquals('Unable to parse CAA data',
-                          err.exception.message)
+                          text_type(err.exception))
 
     def test_command_generation(self):
         zone = Zone('unit.tests.', [])
@@ -312,7 +313,7 @@ class TestMythicBeastsProvider(TestCase):
         with self.assertRaises(AssertionError) as err:
             provider = MythicBeastsProvider('test', None)
         self.assertEquals('Passwords must be a dictionary',
-                          err.exception.message)
+                          text_type(err.exception))
 
         # Missing password
         with requests_mock() as mock:
@@ -324,7 +325,7 @@ class TestMythicBeastsProvider(TestCase):
                 provider.populate(zone)
             self.assertEquals(
                 'Missing password for domain: unit.tests',
-                err.exception.message)
+                text_type(err.exception))
 
         # Failed authentication
         with requests_mock() as mock:
@@ -413,8 +414,7 @@ class TestMythicBeastsProvider(TestCase):
                 provider.apply(plan)
             self.assertEquals(
                 'Mythic Beasts could not action command: unit.tests '
-                'ADD prawf.unit.tests 300 TXT prawf',
-                err.exception.message)
+                'ADD prawf.unit.tests 300 TXT prawf', err.exception.message)
 
         # Check deleting and adding/changing test record
         existing = 'prawf 300 TXT prawf prawf prawf\ndileu 300 TXT dileu'

tests/test_octodns_provider_powerdns.py

@@ -9,6 +9,7 @@ from json import loads, dumps
 from os.path import dirname, join
 from requests import HTTPError
 from requests_mock import ANY, mock as requests_mock
+from six import text_type
 from unittest import TestCase
 
 from octodns.record import Record
@@ -52,7 +53,7 @@ class TestPowerDnsProvider(TestCase):
             with self.assertRaises(Exception) as ctx:
                 zone = Zone('unit.tests.', [])
                 provider.populate(zone)
-            self.assertTrue('unauthorized' in ctx.exception.message)
+            self.assertTrue('unauthorized' in text_type(ctx.exception))
 
         # General error
         with requests_mock() as mock:

tests/test_octodns_provider_rackspace.py

@@ -7,6 +7,7 @@ from __future__ import absolute_import, division, print_function, \
 
 import json
 import re
+from six import text_type
 from unittest import TestCase
 from urlparse import urlparse
 
@@ -53,7 +54,7 @@ class TestRackspaceProvider(TestCase):
             with self.assertRaises(Exception) as ctx:
                 zone = Zone('unit.tests.', [])
                 self.provider.populate(zone)
-            self.assertTrue('unauthorized' in ctx.exception.message)
+            self.assertTrue('unauthorized' in text_type(ctx.exception))
             self.assertTrue(mock.called_once)
 
     def test_server_error(self):

tests/test_octodns_provider_route53.py

@@ -7,6 +7,7 @@ from __future__ import absolute_import, division, print_function, \
 
 from botocore.exceptions import ClientError
 from botocore.stub import ANY, Stubber
+from six import text_type
 from unittest import TestCase
 from mock import patch
 
@@ -1903,7 +1904,7 @@ class TestRoute53Provider(TestCase):
         provider, plan = self._get_test_plan(1)
         with self.assertRaises(Exception) as ctx:
             provider.apply(plan)
-        self.assertTrue('modifications' in ctx.exception.message)
+        self.assertTrue('modifications' in text_type(ctx.exception))
 
     def test_semicolon_fixup(self):
         provider = Route53Provider('test', 'abc', '123')

tests/test_octodns_provider_yaml.py

@@ -8,6 +8,7 @@ from __future__ import absolute_import, division, print_function, \
 from os import makedirs
 from os.path import basename, dirname, isdir, isfile, join
 from unittest import TestCase
+from six import text_type
 from yaml import safe_load
 from yaml.constructor import ConstructorError
 
@@ -181,7 +182,7 @@ class TestYamlProvider(TestCase):
         with self.assertRaises(SubzoneRecordException) as ctx:
             source.populate(zone)
         self.assertEquals('Record www.sub.unit.tests. is under a managed '
-                          'subzone', ctx.exception.message)
+                          'subzone', text_type(ctx.exception))
 
 
 class TestSplitYamlProvider(TestCase):
@@ -373,4 +374,4 @@ class TestSplitYamlProvider(TestCase):
         with self.assertRaises(SubzoneRecordException) as ctx:
             source.populate(zone)
         self.assertEquals('Record www.sub.unit.tests. is under a managed '
-                          'subzone', ctx.exception.message)
+                          'subzone', text_type(ctx.exception))

tests/test_octodns_record.py

@@ -758,14 +758,14 @@ class TestRecord(TestCase):
         # Missing type
         with self.assertRaises(Exception) as ctx:
             Record.new(self.zone, 'unknown', {})
-        self.assertTrue('missing type' in ctx.exception.message)
+        self.assertTrue('missing type' in text_type(ctx.exception))
 
         # Unknown type
         with self.assertRaises(Exception) as ctx:
             Record.new(self.zone, 'unknown', {
                 'type': 'XXX',
             })
-        self.assertTrue('Unknown record type' in ctx.exception.message)
+        self.assertTrue('Unknown record type' in text_type(ctx.exception))
 
     def test_change(self):
         existing = Record.new(self.zone, 'txt', {

tests/test_octodns_source_axfr.py

@@ -9,6 +9,7 @@ import dns.zone
 from dns.exception import DNSException
 
 from mock import patch
+from six import text_type
 from unittest import TestCase
 
 from octodns.source.axfr import AxfrSource, AxfrSourceZoneTransferFailed, \
@@ -38,7 +39,7 @@ class TestAxfrSource(TestCase):
             zone = Zone('unit.tests.', [])
             self.source.populate(zone)
         self.assertEquals('Unable to Perform Zone Transfer',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
 
 
 class TestZoneFileSource(TestCase):
@@ -68,4 +69,4 @@ class TestZoneFileSource(TestCase):
             zone = Zone('invalid.zone.', [])
             self.source.populate(zone)
         self.assertEquals('The DNS zone has no NS RRset at its origin.',
-                          ctx.exception.message)
+                          text_type(ctx.exception))

tests/test_octodns_zone.py

@@ -6,6 +6,7 @@ from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
 from unittest import TestCase
+from six import text_type
 
 from octodns.record import ARecord, AaaaRecord, Create, Delete, Record, Update
 from octodns.zone import DuplicateRecordException, InvalidNodeException, \
@@ -47,7 +48,7 @@ class TestZone(TestCase):
         with self.assertRaises(DuplicateRecordException) as ctx:
             zone.add_record(a)
         self.assertEquals('Duplicate record a.unit.tests., type A',
-                          ctx.exception.message)
+                          text_type(ctx.exception))
         self.assertEquals(zone.records, set([a]))
 
         # can add duplicate with replace=True
@@ -137,7 +138,7 @@ class TestZone(TestCase):
     def test_missing_dot(self):
         with self.assertRaises(Exception) as ctx:
             Zone('not.allowed', [])
-        self.assertTrue('missing ending dot' in ctx.exception.message)
+        self.assertTrue('missing ending dot' in text_type(ctx.exception))
 
     def test_sub_zones(self):
 
@@ -160,7 +161,7 @@ class TestZone(TestCase):
         })
         with self.assertRaises(SubzoneRecordException) as ctx:
             zone.add_record(record)
-        self.assertTrue('not of type NS', ctx.exception.message)
+        self.assertTrue('not of type NS', text_type(ctx.exception))
         # Can add it w/lenient
         zone.add_record(record, lenient=True)
         self.assertEquals(set([record]), zone.records)
@@ -174,7 +175,7 @@ class TestZone(TestCase):
         })
         with self.assertRaises(SubzoneRecordException) as ctx:
             zone.add_record(record)
-        self.assertTrue('under a managed sub-zone', ctx.exception.message)
+        self.assertTrue('under a managed sub-zone', text_type(ctx.exception))
         # Can add it w/lenient
         zone.add_record(record, lenient=True)
         self.assertEquals(set([record]), zone.records)
@@ -188,7 +189,7 @@ class TestZone(TestCase):
         })
         with self.assertRaises(SubzoneRecordException) as ctx:
             zone.add_record(record)
-        self.assertTrue('under a managed sub-zone', ctx.exception.message)
+        self.assertTrue('under a managed sub-zone', text_type(ctx.exception))
         # Can add it w/lenient
         zone.add_record(record, lenient=True)
         self.assertEquals(set([record]), zone.records)