Allow both digits and url; remove unused import

skimbrel · skimbrel · commit 9b10f302ddbf · 2013-11-04T13:15:43.000-08:00
diff --git a/tests/test_twiml.py b/tests/test_twiml.py
@@ -157,9 +157,6 @@ def testPlayDigits(self):
     def testUrlOrDigitsRequired(self):
         self.assertRaises(TwimlException, twiml.Play)
 
-    def testEitherUrlOrDigits(self):
-        self.assertRaises(TwimlException, twiml.Play, url='http://example.com', digits='1')
-
 
 class TestRecord(TwilioTest):
 
diff --git a/twilio/twiml.py b/twilio/twiml.py
@@ -2,7 +2,6 @@
 Make sure to check out the TwiML overview and tutorial
 """
 import xml.etree.ElementTree as ET
-from six import iteritems
 
 
 class TwimlException(Exception):
@@ -240,13 +239,16 @@ def __init__(self, text, **kwargs):
 class Play(Verb):
     """Play DTMF digits or audio from a URL.
 
-    :param str url: point to af audio file. The MIME type on the file must be
-                    set correctly. Either `url` or `digits` must be specified.
+    :param str url: point to an audio file. The MIME type on the file must be
+                    set correctly. At least one of `url` and `digits` must be
+                    specified. If both are given, the digits will play prior
+                    to the audio from the URL.
 
     :param str digits: a string of digits to play. To pause before playing
                    digits, use leading 'w' characters. Each 'w' will cause
                    Twilio to wait 0.5 seconds instead of playing a digit.
-                   Either `url` or `digits` must be specified.
+                   At least one of `url` and `digits` must be specified.
+                   If both are given, the digits will play first.
 
     :param int loop: specifies how many times you'd like the text repeated.
                  Specifying '0' will cause the the :class:`Play` verb to loop
@@ -257,8 +259,6 @@ def __init__(self, url=None, digits=None, **kwargs):
             raise TwimlException(
                 "Please specify either a url or digits to play.",
             )
-        if url is not None and digits is not None:
-            raise TwimlException("Please specify only one of: (url, digits).")
 
         if digits is not None:
             kwargs['digits'] = digits
