Merge remote-tracking branch 'origin/master' into zone-shallow-copy

octodns/provider/azuredns.py

@@ -20,10 +20,11 @@ from azure.mgmt.trafficmanager.models import Profile, DnsConfig, \
 import logging
 from functools import reduce
 from ..record import Record, Update, GeoCodes
+from . import ProviderException
 from .base import BaseProvider
 
 
-class AzureException(Exception):
+class AzureException(ProviderException):
     pass
 
 

octodns/provider/cloudflare.py

@@ -13,10 +13,11 @@ from time import sleep
 from urllib.parse import urlsplit
 
 from ..record import Record, Update
+from . import ProviderException
 from .base import BaseProvider
 
 
-class CloudflareError(Exception):
+class CloudflareError(ProviderException):
     def __init__(self, data):
         try:
             message = data['errors'][0]['message']

octodns/provider/constellix.py

@@ -15,10 +15,11 @@ import logging
 import time
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class ConstellixClientException(Exception):
+class ConstellixClientException(ProviderException):
     pass
 
 

octodns/provider/digitalocean.py

@@ -10,10 +10,11 @@ from requests import Session
 import logging
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class DigitalOceanClientException(Exception):
+class DigitalOceanClientException(ProviderException):
     pass
 
 

octodns/provider/dnsimple.py

@@ -10,10 +10,11 @@ from requests import Session
 import logging
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class DnsimpleClientException(Exception):
+class DnsimpleClientException(ProviderException):
     pass
 
 

octodns/provider/dnsmadeeasy.py

@@ -13,10 +13,11 @@ import hmac
 import logging
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class DnsMadeEasyClientException(Exception):
+class DnsMadeEasyClientException(ProviderException):
     pass
 
 

octodns/provider/easydns.py

@@ -12,10 +12,11 @@ import logging
 import base64
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class EasyDNSClientException(Exception):
+class EasyDNSClientException(ProviderException):
     pass
 
 

octodns/provider/edgedns.py

@@ -12,10 +12,11 @@ from collections import defaultdict
 
 from logging import getLogger
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class AkamaiClientNotFound(Exception):
+class AkamaiClientNotFound(ProviderException):
 
     def __init__(self, resp):
         message = "404: Resource not found"

octodns/provider/gandi.py

@@ -10,10 +10,11 @@ from requests import Session
 import logging
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class GandiClientException(Exception):
+class GandiClientException(ProviderException):
     pass
 
 

octodns/provider/gcore.py

@@ -17,10 +17,11 @@ import urllib.parse
 
 from ..record import GeoCodes
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class GCoreClientException(Exception):
+class GCoreClientException(ProviderException):
     def __init__(self, r):
         super(GCoreClientException, self).__init__(r.text)
 

octodns/provider/hetzner.py

@@ -10,10 +10,11 @@ from requests import Session
 import logging
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class HetznerClientException(Exception):
+class HetznerClientException(ProviderException):
     pass
 
 

octodns/provider/mythicbeasts.py

@@ -11,6 +11,7 @@ from requests import Session
 from logging import getLogger
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 from collections import defaultdict
@@ -34,7 +35,7 @@ def remove_trailing_dot(value):
     return value[:-1]
 
 
-class MythicBeastsUnauthorizedException(Exception):
+class MythicBeastsUnauthorizedException(ProviderException):
     def __init__(self, zone, *args):
         self.zone = zone
         self.message = 'Mythic Beasts unauthorized for zone: {}'.format(
@@ -45,7 +46,7 @@ class MythicBeastsUnauthorizedException(Exception):
             self.message, self.zone, *args)
 
 
-class MythicBeastsRecordException(Exception):
+class MythicBeastsRecordException(ProviderException):
     def __init__(self, zone, command, *args):
         self.zone = zone
         self.command = command

octodns/provider/ns1.py

@@ -17,6 +17,7 @@ from uuid import uuid4
 from six import text_type
 
 from ..record import Record, Update
+from . import ProviderException
 from .base import BaseProvider
 
 
@@ -24,7 +25,7 @@ def _ensure_endswith_dot(string):
     return string if string.endswith('.') else '{}.'.format(string)
 
 
-class Ns1Exception(Exception):
+class Ns1Exception(ProviderException):
     pass
 
 

octodns/provider/route53.py

@@ -19,6 +19,7 @@ from six import text_type
 from ..equality import EqualityTupleMixin
 from ..record import Record, Update
 from ..record.geo import GeoCodes
+from . import ProviderException
 from .base import BaseProvider
 
 octal_re = re.compile(r'\\(\d\d\d)')
@@ -512,7 +513,7 @@ class _Route53GeoRecord(_Route53Record):
                                                           self.values)
 
 
-class Route53ProviderException(Exception):
+class Route53ProviderException(ProviderException):
     pass
 
 

octodns/provider/selectel.py

@@ -12,6 +12,7 @@ from logging import getLogger
 from requests import Session
 
 from ..record import Record, Update
+from . import ProviderException
 from .base import BaseProvider
 
 
@@ -20,7 +21,7 @@ def escape_semicolon(s):
     return s.replace(';', '\\;')
 
 
-class SelectelAuthenticationRequired(Exception):
+class SelectelAuthenticationRequired(ProviderException):
     def __init__(self, msg):
         message = 'Authorization failed. Invalid or empty token.'
         super(SelectelAuthenticationRequired, self).__init__(message)

octodns/provider/transip.py

@@ -8,6 +8,7 @@ from __future__ import absolute_import, division, print_function, \
 from suds import WebFault
 
 from collections import defaultdict
+from . import ProviderException
 from .base import BaseProvider
 from logging import getLogger
 from ..record import Record
@@ -15,7 +16,7 @@ from transip.service.domain import DomainService
 from transip.service.objects import DnsEntry
 
 
-class TransipException(Exception):
+class TransipException(ProviderException):
     pass
 
 

octodns/provider/ultra.py

@@ -3,10 +3,11 @@ from logging import getLogger
 from requests import Session
 
 from ..record import Record
+from . import ProviderException
 from .base import BaseProvider
 
 
-class UltraClientException(Exception):
+class UltraClientException(ProviderException):
     '''
     Base Ultra exception type
     '''