twilio · dougblack · Aug 18, 2017 · Aug 18, 2017 · Aug 18, 2017 · Aug 18, 2017
diff --git a/tests/unit/rest/test_client.py b/tests/unit/rest/test_client.py
@@ -0,0 +1,45 @@
+import unittest
+from twilio.rest import (
+    TwilioClient,
+    TwilioRestClient,
+    TwilioIpMessagingClient,
+    TwilioLookupsClient,
+    TwilioMonitorClient,
+    TwilioPricingClient,
+    TwilioTaskRouterClient,
+    TwilioTrunkingClient,
+)
+from twilio.base.obsolete import ObsoleteException
+
+class TestDummyClients(unittest.TestCase):
+    def test_obsolete_exception_twilioclient(self):
+        self.assertRaises(ObsoleteException, TwilioClient,
+                          "Expected raised ObsoleteException")
+
+    def test_obsolete_exception_twiliorestclient(self):
+        self.assertRaises(ObsoleteException, TwilioRestClient,
+                          "Expected raised ObsoleteException")
+
+    def test_obsolete_exception_twilioipmessagingclient(self):
+        self.assertRaises(ObsoleteException, TwilioIpMessagingClient,
+                          "Expected raised ObsoleteException")
+
+    def test_obsolete_exception_twiliolookupsclient(self):
+        self.assertRaises(ObsoleteException, TwilioLookupsClient,
+                          "Expected raised ObsoleteException")
+
+    def test_obsolete_exception_twiliomonitorclient(self):
+        self.assertRaises(ObsoleteException, TwilioMonitorClient,
+                          "Expected raised ObsoleteException")
+
+    def test_obsolete_exception_twiliopricingclient(self):
+        self.assertRaises(ObsoleteException, TwilioPricingClient,
+                          "Expected raised ObsoleteException")
+
+    def test_obsolete_exception_twiliotaskrouterclient(self):
+        self.assertRaises(ObsoleteException, TwilioTaskRouterClient,
+                          "Expected raised ObsoleteException")
+
+    def test_obsolete_exception_twiliotrunkingclient(self):
+        self.assertRaises(ObsoleteException, TwilioTrunkingClient,
+                          "Expected raised ObsoleteException")
diff --git a/twilio/base/obsolete.py b/twilio/base/obsolete.py
@@ -0,0 +1,21 @@
+import warnings
+import functools
+
+
+class ObsoleteException(BaseException):
+    """ Base class for warnings about obsolete features. """
+    pass
+
+
+def obsolete_client(func):
+    '''This is a decorator which can be used to mark Client classes
+    as obsolete. It will result in an error being emitted
+    when the class is instantiated.'''
+
+    @functools.wraps(func)
+    def new_func(*args, **kwargs):
+        raise ObsoleteException("{} has been removed from this version of the library. "
+                              "Please refer to current documentation for guidance."
+                              .format(func.__name__))
+
+    return new_func
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -10,6 +10,7 @@
 import platform
 from twilio import __version__
 from twilio.base.exceptions import TwilioException
+from twilio.base.obsolete import obsolete_client
 from twilio.http.http_client import TwilioHttpClient
 
 
@@ -496,3 +497,75 @@ def __repr__(self):
         :rtype: str
         """
         return '<Twilio {}>'.format(self.account_sid)
+
+
+@obsolete_client
+class TwilioClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
+
+
+@obsolete_client
+class TwilioRestClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
+
+
+@obsolete_client
+class TwilioIpMessagingClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
+
+
+@obsolete_client
+class TwilioLookupsClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
+
+
+@obsolete_client
+class TwilioMonitorClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
+
+
+@obsolete_client
+class TwilioPricingClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
+
+
+@obsolete_client
+class TwilioTaskRouterClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
+
+
+@obsolete_client
+class TwilioTrunkingClient(object):
+    """ Dummy client which provides no functionality. Please use
+    twilio.rest.Client instead. """
+
+    def __init__(self, *args):
+        pass
diff --git a/twilio/twiml/__init__.py b/twilio/twiml/__init__.py
@@ -1,5 +1,6 @@
 import re
 import xml.etree.ElementTree as ET
+from twilio.base.obsolete import obsolete_client
 
 
 def lower_camel(string):
@@ -117,3 +118,11 @@ def xml(self):
             el.append(verb.xml())
 
         return el
+
+
+@obsolete_client
+class Client(object):
+    """ Dummy client which provides no functionality. """
+
+    def __init__(self, *args):
+        pass