task/Update models to be python version agnostic

bandwidth/model/bxml/verbs/phone_number.py

@@ -33,17 +33,17 @@ def __init__(
             tag (str, optional):  A custom string that will be sent with these and all future callbacks unless overwritten by a future tag attribute or cleared. May be cleared by setting tag="" Max length 256 characters. Defaults to None.
         """
         self.attributes = {
-            "fallbackPassword": fallback_password,
-            "fallbackUsername": fallback_username,
-            "password": password,
-            "tag": tag,
-            "transferAnswerFallbackMethod": transfer_answer_fallback_method,
-            "transferAnswerFallbackUrl": transfer_answer_fallback_url,
-            "transferAnswerMethod": transfer_answer_method,
             "transferAnswerUrl": transfer_answer_url,
-            "transferDisconnectMethod": transfer_disconnect_method,
+            "transferAnswerMethod": transfer_answer_method,
+            "transferAnswerFallbackUrl": transfer_answer_fallback_url,
+            "transferAnswerFallbackMethod": transfer_answer_fallback_method,
             "transferDisconnectUrl": transfer_disconnect_url,
-            "username": username
+            "transferDisconnectMethod": transfer_disconnect_method,
+            "username": username,
+            "password": password,
+            "fallbackUsername": fallback_username,
+            "fallbackPassword": fallback_password,
+            "tag": tag
         }
         super().__init__(
             tag="PhoneNumber",

bandwidth/model/bxml/verbs/sip_uri.py

@@ -34,18 +34,18 @@ def __init__(
             tag (str, optional):  A custom string that will be sent with these and all future callbacks unless overwritten by a future tag attribute or cleared. May be cleared by setting tag="" Max length 256 characters. Defaults to None.
         """
         self.attributes = {
-            "fallbackPassword": fallback_password,
-            "fallbackUsername": fallback_username,
-            "password": password,
-            "tag": tag,
-            "transferAnswerFallbackMethod": transfer_answer_fallback_method,
-            "transferAnswerFallbackUrl": transfer_answer_fallback_url,
-            "transferAnswerMethod": transfer_answer_method,
+            "uui": uui,
             "transferAnswerUrl": transfer_answer_url,
-            "transferDisconnectMethod": transfer_disconnect_method,
+            "transferAnswerMethod": transfer_answer_method,
+            "transferAnswerFallbackUrl": transfer_answer_fallback_url,
+            "transferAnswerFallbackMethod": transfer_answer_fallback_method,
             "transferDisconnectUrl": transfer_disconnect_url,
+            "transferDisconnectMethod": transfer_disconnect_method,
             "username": username,
-            "uui": uui
+            "password": password,
+            "fallbackUsername": fallback_username,
+            "fallbackPassword": fallback_password,
+            "tag": tag
         }
         super().__init__(
             tag="SipUri",

bandwidth/model/bxml/verbs/transfer.py

@@ -62,19 +62,19 @@ def __init__(
                 Defaults to None.
         """
         self.attributes = {
+            "transferCallerId": transfer_caller_id,
             "callTimeout": call_timeout,
-            "diversionReason": diversion_reason,
-            "diversionTreatment": diversion_treatment,
-            "fallbackPassword": fallback_password,
-            "fallbackUsername": fallback_username,
+            "transferCompleteUrl": transfer_complete_url,
+            "transferCompleteMethod": transfer_complete_method,
+            "transferCompleteFallbackUrl": transfer_complete_fallback_url,
+            "transferCompleteFallbackMethod": transfer_complete_fallback_method,
+            "username": username,
             "password": password,
+            "fallbackUsername": fallback_username,
+            "fallbackPassword": fallback_password,
             "tag": tag,
-            "transferCallerId": transfer_caller_id,
-            "transferCompleteFallbackMethod": transfer_complete_fallback_method,
-            "transferCompleteFallbackUrl": transfer_complete_fallback_url,
-            "transferCompleteMethod": transfer_complete_method,
-            "transferCompleteUrl": transfer_complete_url,
-            "username": username
+            "diversionTreatment": diversion_treatment,
+            "diversionReason": diversion_reason
         }
         super().__init__(
             tag="Transfer",

test/unit/bxml/test_phone_number.py

@@ -5,6 +5,7 @@
 
 @copyright Bandwidth Inc.
 """
+import os
 import pytest
 import unittest
 
@@ -17,14 +18,18 @@ class TestPhoneNumber(unittest.TestCase):
     def setUp(self):
         self.phone_number = PhoneNumber(
             number="+19195551234",
-            tag="",
+            transfer_answer_url="https://example.com/webhooks/transfer_answer",
             transfer_answer_method="POST",
-            transfer_answer_url="https://example.com/webhooks/transfer_answer"
+            tag=""
         )
         self.test_verb = Verb(tag="test")
 
     def test_to_bxml(self):
-        expected = '<PhoneNumber tag="" transferAnswerMethod="POST" transferAnswerUrl="https://example.com/webhooks/transfer_answer">+19195551234</PhoneNumber>'
+        if os.environ['PYTHON_VERSION'] == '3.7':
+            expected = '<PhoneNumber tag="" transferAnswerMethod="POST" transferAnswerUrl="https://example.com/webhooks/transfer_answer">+19195551234</PhoneNumber>'
+        else:
+            expected = '<PhoneNumber transferAnswerUrl="https://example.com/webhooks/transfer_answer" transferAnswerMethod="POST" tag="">+19195551234</PhoneNumber>'
+
         assert(expected == self.phone_number.to_bxml())
 
     def test_add_verb(self):

test/unit/bxml/test_sip_uri.py

@@ -5,6 +5,7 @@
 
 @copyright Bandwidth Inc.
 """
+import os
 import pytest
 import unittest
 
@@ -17,15 +18,18 @@ class TestSipUri(unittest.TestCase):
     def setUp(self):
         self.phone_number = SipUri(
             uri="sip:1-999-123-4567@voip-provider.example.net",
-            tag="test",
-            transfer_answer_method="POST",
+            uui="abc123",
             transfer_answer_url="https://example.com/webhooks/transfer_answer",
-            uui="abc123"
+            transfer_answer_method="POST",
+            tag="test"
         )
         self.test_verb = Verb(tag="test")
 
     def test_to_bxml(self):
-        expected = '<SipUri tag="test" transferAnswerMethod="POST" transferAnswerUrl="https://example.com/webhooks/transfer_answer" uui="abc123">sip:1-999-123-4567@voip-provider.example.net</SipUri>'
+        if os.environ['PYTHON_VERSION'] == '3.7':
+            expected = '<SipUri tag="test" transferAnswerMethod="POST" transferAnswerUrl="https://example.com/webhooks/transfer_answer" uui="abc123">sip:1-999-123-4567@voip-provider.example.net</SipUri>'
+        else:
+            expected = '<SipUri uui="abc123" transferAnswerUrl="https://example.com/webhooks/transfer_answer" transferAnswerMethod="POST" tag="test">sip:1-999-123-4567@voip-provider.example.net</SipUri>'
         assert(expected == self.phone_number.to_bxml())
 
     def test_add_verb(self):

test/unit/bxml/test_transfer.py

@@ -5,6 +5,7 @@
 
 @copyright Bandwidth Inc.
 """
+import os
 import pytest
 import unittest
 
@@ -27,15 +28,21 @@ def setUp(self):
         self.transfer = Transfer(
             transfer_to=[self.sip_uri],
             call_timeout = "15",
-            tag = "test",
-            transfer_caller_id = "+19195554321"
+            transfer_caller_id = "+19195554321",
+            tag = "test"
         )
 
     def test_to_bxml(self):
-        expected = '<Transfer callTimeout="15" tag="test" transferCallerId="+19195554321"><SipUri uui="test">sip@bw.com</SipUri></Transfer>'
+        if os.environ['PYTHON_VERSION'] == '3.7':
+            expected = '<Transfer callTimeout="15" tag="test" transferCallerId="+19195554321"><SipUri uui="test">sip@bw.com</SipUri></Transfer>'
+        else:
+            expected = '<Transfer transferCallerId="+19195554321" callTimeout="15" tag="test"><SipUri uui="test">sip@bw.com</SipUri></Transfer>'
         assert(expected == self.transfer.to_bxml())
 
     def test_add_verb(self):
-        expected = '<Transfer callTimeout="15" tag="test" transferCallerId="+19195554321"><SipUri uui="test">sip@bw.com</SipUri><PhoneNumber tag="test">+19195551234</PhoneNumber></Transfer>'
+        if os.environ['PYTHON_VERSION'] == '3.7':
+            expected = '<Transfer callTimeout="15" tag="test" transferCallerId="+19195554321"><SipUri uui="test">sip@bw.com</SipUri><PhoneNumber tag="test">+19195551234</PhoneNumber></Transfer>'
+        else:
+            expected = '<Transfer transferCallerId="+19195554321" callTimeout="15" tag="test"><SipUri uui="test">sip@bw.com</SipUri><PhoneNumber tag="test">+19195551234</PhoneNumber></Transfer>'
         self.transfer.add_transfer_recipient(self.phone_number)
         assert(expected == self.transfer.to_bxml())