diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6d72e6de..15eefefa 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,7 +13,7 @@ on: type: choice options: - WARNING - - DEBUG + - DEBUG jobs: deploy: @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [windows-2022, windows-2019, ubuntu-18.04, ubuntu-20.04] - python-version: [3.7, 3.8, 3.9, "3.10"] + python-version: [3.8, 3.9, "3.10"] env: BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} BW_USERNAME: ${{ secrets.BW_USERNAME }} diff --git a/bandwidth/model/bxml/__init__.py b/bandwidth/model/bxml/__init__.py index a9b3480d..4fc2e598 100644 --- a/bandwidth/model/bxml/__init__.py +++ b/bandwidth/model/bxml/__init__.py @@ -1,3 +1,3 @@ -from . import response -from . import bxml +from .response import Response +from .bxml import Bxml from . import verbs diff --git a/bandwidth/model/bxml/root.py b/bandwidth/model/bxml/root.py index 0ed28585..dd5e46ed 100644 --- a/bandwidth/model/bxml/root.py +++ b/bandwidth/model/bxml/root.py @@ -34,7 +34,7 @@ def __len__(self) -> int: int: Length of self._nested_verbs """ return len(self._nested_verbs) - + def __getitem__(self, position: int) -> Verb: """Override default getitem method. Makes the object iterable. @@ -42,10 +42,10 @@ def __getitem__(self, position: int) -> Verb: position (int): Desired self._nested_verbs list position Returns: - BxmlVerb: Desired BXML verb + BxmlVerb: Desired BXML verb """ return self._nested_verbs[position] - + def _generate_xml(self) -> ET.Element: """Generates an XML dom @@ -58,7 +58,7 @@ def _generate_xml(self) -> ET.Element: root.append(verb._to_etree_element()) dom = ET.ElementTree(root) return dom - + def add_verb(self, verb: Verb) -> None: """Add a verb to the object's nested_verbs array @@ -66,7 +66,7 @@ def add_verb(self, verb: Verb) -> None: verb (BxmlVerb): BXML verb to nest within the parent. Becomes a child xml element. """ self._nested_verbs.append(verb) - + def to_bxml(self) -> str: """Return the serialized BXML string @@ -74,5 +74,4 @@ def to_bxml(self) -> str: str: Serialized BXML string """ xml_document = self._generate_xml() - return ET.tostring(xml_document._root, encoding='utf8', method='xml').decode("utf8") - + return ET.tostring(xml_document._root, encoding='UTF-8', method='xml', xml_declaration=True).decode("utf8") diff --git a/bandwidth/model/bxml/verbs/conference.py b/bandwidth/model/bxml/verbs/conference.py index eb722b7d..9fbac54c 100644 --- a/bandwidth/model/bxml/verbs/conference.py +++ b/bandwidth/model/bxml/verbs/conference.py @@ -65,13 +65,13 @@ def __init__( self.tag = tag self.callback_timeout = callback_timeout super().__init__( - tag="Conference", - content=self.name + tag="Conference" ) @property def _attributes(self): return { + "name": self.name, "mute": self.mute, "hold": self.hold, "callIdsToCoach": self.call_ids_to_coach, diff --git a/setup.py b/setup.py index ffec57da..2eecca34 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,6 @@ REQUIRES = [ "urllib3 >= 1.25.3", "python-dateutil", - "lxml>=4.9.1", ] setup( diff --git a/test/unit/bxml/test_base_classes.py b/test/unit/bxml/test_base_classes.py index 4457a5ad..d7f67ba4 100644 --- a/test/unit/bxml/test_base_classes.py +++ b/test/unit/bxml/test_base_classes.py @@ -27,7 +27,7 @@ def test_root(self): self.root.add_verb(self.verb1) self.root.add_verb(self.verb2) - expected_bxml = "\ntest" + expected_bxml = "\ntest" assert(type(self.root[0]) == Verb) assert(len(self.root) == 2) assert(expected_bxml == self.root.to_bxml()) diff --git a/test/unit/bxml/test_bridge.py b/test/unit/bxml/test_bridge.py index 649dd50a..493c9f88 100644 --- a/test/unit/bxml/test_bridge.py +++ b/test/unit/bxml/test_bridge.py @@ -24,8 +24,5 @@ def setUp(self): self.test_verb = Verb(tag="test") def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '+19198675309' - else: - expected = '+19198675309' + expected = '+19198675309' assert(expected == self.bridge.to_bxml()) diff --git a/test/unit/bxml/test_bxml.py b/test/unit/bxml/test_bxml.py index 47dcecff..748a4f30 100644 --- a/test/unit/bxml/test_bxml.py +++ b/test/unit/bxml/test_bxml.py @@ -15,8 +15,8 @@ class TestBxml(unittest.TestCase): def setUp(self): self.response = Bxml() - def test_response_init(self): + def test_bxml_init(self): """Test initializing the root """ - expected_bxml = "\n" + expected_bxml = "\n" assert self.response.to_bxml() == expected_bxml diff --git a/test/unit/bxml/test_conference.py b/test/unit/bxml/test_conference.py index e2fceca7..58718b94 100644 --- a/test/unit/bxml/test_conference.py +++ b/test/unit/bxml/test_conference.py @@ -34,8 +34,5 @@ def setUp(self): self.test_verb = Verb(tag="test") def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = 'conf1' - else: - expected = 'conf1' + expected = '' assert(expected == self.conference.to_bxml()) diff --git a/test/unit/bxml/test_forward.py b/test/unit/bxml/test_forward.py index 4d78dc7f..99589bf7 100644 --- a/test/unit/bxml/test_forward.py +++ b/test/unit/bxml/test_forward.py @@ -24,10 +24,6 @@ def setUp(self): ) self.test_verb = Verb(tag="test") - def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '' - else: - expected = '' + expected = '' assert(expected == self.forward.to_bxml()) diff --git a/test/unit/bxml/test_gather.py b/test/unit/bxml/test_gather.py index 25fa2e00..0ab939f9 100644 --- a/test/unit/bxml/test_gather.py +++ b/test/unit/bxml/test_gather.py @@ -44,16 +44,10 @@ def setUp(self): ) def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = 'https://audio.url/audio1.wav' - else: - expected = 'https://audio.url/audio1.wav' + expected = 'https://audio.url/audio1.wav' assert(expected == self.gather.to_bxml()) def test_add_verb(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = 'https://audio.url/audio1.wavHello. 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.' - else: - expected = 'https://audio.url/audio1.wavHello. 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.' + expected = 'https://audio.url/audio1.wavHello. 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.' self.gather.add_verb(self.speak_sentence) assert(expected == self.gather.to_bxml()) diff --git a/test/unit/bxml/test_phone_number.py b/test/unit/bxml/test_phone_number.py index f5f47d54..16db660b 100644 --- a/test/unit/bxml/test_phone_number.py +++ b/test/unit/bxml/test_phone_number.py @@ -24,9 +24,5 @@ def setUp(self): self.test_verb = Verb(tag="test") def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '+19195551234' - else: - expected = '+19195551234' - + expected = '+19195551234' assert(expected == self.phone_number.to_bxml()) diff --git a/test/unit/bxml/test_play_audio.py b/test/unit/bxml/test_play_audio.py index 9571deb6..ca195c50 100644 --- a/test/unit/bxml/test_play_audio.py +++ b/test/unit/bxml/test_play_audio.py @@ -23,8 +23,5 @@ def setUp(self): def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = 'https://audio.url/audio1.wav' - else: - expected = 'https://audio.url/audio1.wav' + expected = 'https://audio.url/audio1.wav' assert(expected == self.play_audio.to_bxml()) diff --git a/test/unit/bxml/test_response.py b/test/unit/bxml/test_response.py index 552eb3d4..218c2cc5 100644 --- a/test/unit/bxml/test_response.py +++ b/test/unit/bxml/test_response.py @@ -18,5 +18,5 @@ def setUp(self): def test_response_init(self): """Test initializing the root """ - expected_bxml = "\n" + expected_bxml = "\n" assert self.response.to_bxml() == expected_bxml diff --git a/test/unit/bxml/test_ring.py b/test/unit/bxml/test_ring.py index 38ad51e5..1358b878 100644 --- a/test/unit/bxml/test_ring.py +++ b/test/unit/bxml/test_ring.py @@ -22,9 +22,5 @@ def setUp(self): self.test_verb = Verb(tag="test") def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '' - else: - expected = '' - + expected = '' assert(expected == self.ring.to_bxml()) diff --git a/test/unit/bxml/test_sip_uri.py b/test/unit/bxml/test_sip_uri.py index b6cf839a..d5409638 100644 --- a/test/unit/bxml/test_sip_uri.py +++ b/test/unit/bxml/test_sip_uri.py @@ -25,8 +25,5 @@ def setUp(self): self.test_verb = Verb(tag="test") def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = 'sip:1-999-123-4567@voip-provider.example.net' - else: - expected = 'sip:1-999-123-4567@voip-provider.example.net' + expected = 'sip:1-999-123-4567@voip-provider.example.net' assert(expected == self.sip_uri.to_bxml()) diff --git a/test/unit/bxml/test_start_gather.py b/test/unit/bxml/test_start_gather.py index 589bd31a..2cef1c7e 100644 --- a/test/unit/bxml/test_start_gather.py +++ b/test/unit/bxml/test_start_gather.py @@ -25,9 +25,5 @@ def setUp(self): self.test_verb = Verb(tag="test") def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '' - else: - expected = '' - + expected = '' assert(expected == self.start_gather.to_bxml()) diff --git a/test/unit/bxml/test_start_recording.py b/test/unit/bxml/test_start_recording.py index ac3f95ac..88e2bd4d 100644 --- a/test/unit/bxml/test_start_recording.py +++ b/test/unit/bxml/test_start_recording.py @@ -31,9 +31,5 @@ def setUp(self): def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '' - else: - expected = '' - + expected = '' assert(expected == self.start_recording.to_bxml()) diff --git a/test/unit/bxml/test_start_stream.py b/test/unit/bxml/test_start_stream.py index 97e0518f..758ba0e5 100644 --- a/test/unit/bxml/test_start_stream.py +++ b/test/unit/bxml/test_start_stream.py @@ -36,16 +36,10 @@ def setUp(self): ) def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '' - else: - expected = '' + expected = '' assert(expected == self.start_stream.to_bxml()) def test_add_verb(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = '' - else: - expected = '' + expected = '' self.start_stream.add_verb(self.stream_param2) assert(expected == self.start_stream.to_bxml()) diff --git a/test/unit/bxml/test_transfer.py b/test/unit/bxml/test_transfer.py index bbda0f96..80949935 100644 --- a/test/unit/bxml/test_transfer.py +++ b/test/unit/bxml/test_transfer.py @@ -32,16 +32,10 @@ def setUp(self): ) def test_to_bxml(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = 'sip@bw.com' - else: - expected = 'sip@bw.com' + expected = 'sip@bw.com' assert(expected == self.transfer.to_bxml()) def test_add_verb(self): - if os.environ['PYTHON_VERSION'] == '3.7': - expected = 'sip@bw.com+19195551234' - else: - expected = 'sip@bw.com+19195551234' + expected = 'sip@bw.com+19195551234' self.transfer.add_transfer_recipient(self.phone_number) assert(expected == self.transfer.to_bxml())