From 86232b48cf5739050a81b984cc2a8782fca7d229 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 10 Dec 2020 08:30:15 -0800 Subject: [PATCH 1/2] Replace some nbsp chars that have slipped into manager.py somehow --- octodns/manager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/octodns/manager.py b/octodns/manager.py index fc05810..9283d19 100644 --- a/octodns/manager.py +++ b/octodns/manager.py @@ -288,7 +288,7 @@ class Manager(object): self.log.error('Invalid alias zone {}, target {} does ' 'not exist'.format(zone_name, source_zone)) raise ManagerException('Invalid alias zone {}: ' - 'source zone {} does not exist' + 'source zone {} does not exist' .format(zone_name, source_zone)) # Check that the source zone is not an alias zone itself. @@ -296,7 +296,7 @@ class Manager(object): self.log.error('Invalid alias zone {}, target {} is an ' 'alias zone'.format(zone_name, source_zone)) raise ManagerException('Invalid alias zone {}: source ' - 'zone {} is an alias zone' + 'zone {} is an alias zone' .format(zone_name, source_zone)) aliased_zones[zone_name] = source_zone @@ -482,13 +482,13 @@ class Manager(object): if source_zone not in self.config['zones']: self.log.exception('Invalid alias zone') raise ManagerException('Invalid alias zone {}: ' - 'source zone {} does not exist' + 'source zone {} does not exist' .format(zone_name, source_zone)) if 'alias' in self.config['zones'][source_zone]: self.log.exception('Invalid alias zone') raise ManagerException('Invalid alias zone {}: ' - 'source zone {} is an alias zone' + 'source zone {} is an alias zone' .format(zone_name, source_zone)) # this is just here to satisfy coverage, see From a7bb6a306c27c38749d308076925762baa5ca391 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 10 Dec 2020 08:39:31 -0800 Subject: [PATCH 2/2] Remove corresponding nbsp's from manager tests --- tests/test_octodns_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index dc047e8..4e1a756 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -180,7 +180,7 @@ class TestManager(TestCase): tc = Manager(get_config_filename('unknown-source-zone.yaml')) \ .sync() self.assertEquals('Invalid alias zone alias.tests.: source zone ' - 'does-not-exists.tests. does not exist', + 'does-not-exists.tests. does not exist', text_type(ctx.exception)) # Alias zone that points to another alias zone. @@ -188,7 +188,7 @@ class TestManager(TestCase): tc = Manager(get_config_filename('alias-zone-loop.yaml')) \ .sync() self.assertEquals('Invalid alias zone alias-loop.tests.: source ' - 'zone alias.tests. is an alias zone', + 'zone alias.tests. is an alias zone', text_type(ctx.exception)) def test_compare(self):