Update for Attribute Refactoring

Author: brianluisgomez

bandwidth/model/bxml/verbs/gather.py

@@ -63,21 +63,31 @@ def __init__(
         self.first_digit_timeout = first_digit_timeout
         self.repeat_count = repeat_count
         self.audio_verbs = audio_verbs
+        super().__init__(
+            tag="Gather", 
+            content=None,
+            nested_verbs=self.audio_verbs)
+
+    @property
+    def _attributes(self):
+        return {
+            "gather_url": self.gather_url,
+            "gather_method": self.gather_method,
+            "gather_fallback_url": self.gather_fallback_url,
+            "gather_fallback_method": self.gather_fallback_method,
+            "username": self.username,
+            "password": self.password,
+            "fallback_username": self.fallback_username,
+            "fallback_password": self.fallback_password,
+            "tag": self.tag,
+            "terminating_digits": self.terminating_digits,
+            "max_digits": self.max_digits,
+            "inter_digit_timeout": self.inter_digit_timeout,
+            "first_digit_timeout": self.first_digit_timeout,
+            "repeat_count": self.repeat_count,
+        }
         self.attributes = {
-            "gather_url": gather_url,
-            "gather_method": gather_method,
-            "gather_fallback_url": gather_fallback_url,
-            "gather_fallback_method": gather_fallback_method,
-            "username": username,
-            "password": password,
-            "fallback_username": fallback_username,
-            "fallback_password": fallback_password,
-            "tag": tag,
-            "terminating_digits": terminating_digits,
-            "max_digits": max_digits,
-            "inter_digit_timeout": inter_digit_timeout,
-            "first_digit_timeout": first_digit_timeout,
-            "repeat_count": repeat_count,
+
              }       
 
         super().__init__(tag="Gather", content=None, attributes=self.attributes, nested_verbs=self.audio_verbs)

bandwidth/model/bxml/verbs/play_audio.py

@@ -24,12 +24,14 @@ def __init__(
         self.audio_uri = audio_uri
         self.username = username
         self.password = password
-        self.attributes = {
-            "username": self.username,
-            "password": self.password,
-        }
         super().__init__(
             tag="PlayAudio",
             content=self.audio_uri,
-            attributes=self.attributes
         )
+
+    @property
+    def _attributes(self):
+        return {
+            "username": self.username,
+            "password": self.password,
+        }

bandwidth/model/bxml/verbs/speak_sentence.py

@@ -28,13 +28,15 @@ def __init__(
         self.voice = voice
         self.gender = gender
         self.locale = locale
-        self.attributes = {
-            "voice": self.voice,
-            "gender": self.gender,
-            "locale": self.locale,
-        }
         super().__init__(
             tag="SpeakSentence",
             content=self.text,
-            attributes=self.attributes
         )
+
+    @property
+    def _attributes(self):
+        return {
+            "voice": self.voice,
+            "gender": self.gender,
+            "locale": self.locale,
+        }        

test/unit/bxml/test_speak_sentence.py

@@ -16,13 +16,14 @@ class TestSpeakSentence(unittest.TestCase):
 
     def setUp(self):
         self.speak_sentence = SpeakSentence(
-            text='Hello. Your number is <say-as interpret-as="telephone">asdf</say-as>, lets play a game. What is 10 + 3. Press the pound key when finished.'
+            text='Hello. Your number is <say-as interpret-as="telephone">asdf</say-as>, lets play a game. What is 10 + 3. Press the pound key when finished.',
+            voice="julie"
         )
 
         self.test_verb = Verb(tag="test")
 
     def test_to_bxml(self):
-        expected = '<SpeakSentence>Hello. Your number is &lt;say-as interpret-as="telephone"&gt;asdf&lt;/say-as&gt;, lets play a game. What is 10 + 3. Press the pound key when finished.</SpeakSentence>'
+        expected = '<SpeakSentence voice="julie">Hello. Your number is &lt;say-as interpret-as="telephone"&gt;asdf&lt;/say-as&gt;, lets play a game. What is 10 + 3. Press the pound key when finished.</SpeakSentence>'
         assert(expected == self.speak_sentence.to_bxml())
 
     def test_add_verb(self):