Style fixes

Author: [email protected]

messagebird/balance.py

@@ -1,7 +1,8 @@
 from messagebird.base import Base
 
+
 class Balance(Base):
-  def __init__(self):
-    self.amount  = None
-    self.type    = None
-    self.payment = None
+    def __init__(self):
+        self.amount = None
+        self.type = None
+        self.payment = None

messagebird/call.py

@@ -15,13 +15,13 @@ def __init__(self):
     @property
     def data(self):
         return self._data
-     
+
     @data.setter
     def data(self, value):
         self._data = CallData().load(value[0])
 
     def __str__(self):
         return "\n".join([
             'id                 : %s' % self.id,
-            'data.'+'data.'.join(str(self._data).splitlines(True)),
-        ])
+            'data.' + 'data.'.join(str(self._data).splitlines(True)),
+        ])

messagebird/call_data.py

@@ -1,8 +1,9 @@
 from messagebird.base import Base
 from messagebird.webhook import Webhook
 
+
 class CallData(Base):
-    
+
     def __init__(self):
         self.id = None
         self.status = None
@@ -13,27 +14,26 @@ def __init__(self):
         self._endedAt = None
         self._webhook = None
 
-
     @property
     def updatedAt(self):
         return self._updatedAt
-     
+
     @updatedAt.setter
     def updatedAt(self, value):
         self._updatedAt = self.value_to_time(value, '%Y-%m-%dT%H:%M:%SZ')
 
     @property
     def createdAt(self):
         return self._createdAt
-     
+
     @createdAt.setter
     def createdAt(self, value):
         self._createdAt = self.value_to_time(value, '%Y-%m-%dT%H:%M:%SZ')
 
     @property
     def endedAt(self):
         return self._endedAt
-     
+
     @endedAt.setter
     def endedAt(self, value):
         self._endedAt = self.value_to_time(value, '%Y-%m-%dT%H:%M:%SZ')
@@ -56,4 +56,4 @@ def __str__(self):
             'updatedAt          : %s' % self.updatedAt,
             'createdAt          : %s' % self.createdAt,
             'endedAt            : %s' % self.endedAt,
-        ])
+        ])

messagebird/call_flow.py

@@ -60,6 +60,7 @@ def data(self, value):
 
         self._data = items
 
+
 class CallFlow(Base):
 
     def __init__(self):
@@ -134,4 +135,4 @@ def load(self, data):
             if hasattr(self, name) and not callable(getattr(self, name)):
                 setattr(self, name, value)
 
-        return self
+        return self

messagebird/call_list.py

@@ -39,4 +39,3 @@ def data(self, value):
         if isinstance(value, list):
             self.count = len(value)
             self.items = value
-

messagebird/client.py

@@ -191,7 +191,8 @@ def message_list(self, limit=20, offset=0):
 
     def message_create(self, originator, recipients, body, params=None):
         """Create a new message."""
-        if params is None: params = {}
+        if params is None:
+            params = {}
         if type(recipients) == list:
             recipients = ','.join(recipients)
 
@@ -233,7 +234,8 @@ def voice_message(self, id):
 
     def voice_message_create(self, recipients, body, params=None):
         """Create a new voice message."""
-        if params is None: params = {}
+        if params is None:
+            params = {}
         if type(recipients) == list:
             recipients = ','.join(recipients)
 
@@ -242,17 +244,20 @@ def voice_message_create(self, recipients, body, params=None):
 
     def lookup(self, phonenumber, params=None):
         """Do a new lookup."""
-        if params is None: params = {}
+        if params is None:
+            params = {}
         return Lookup().load(self.request('lookup/' + str(phonenumber), 'GET', params))
 
     def lookup_hlr(self, phonenumber, params=None):
         """Retrieve the information of a specific HLR lookup."""
-        if params is None: params = {}
+        if params is None:
+            params = {}
         return HLR().load(self.request('lookup/' + str(phonenumber) + '/hlr', 'GET', params))
 
     def lookup_hlr_create(self, phonenumber, params=None):
         """Perform a new HLR lookup."""
-        if params is None: params = {}
+        if params is None:
+            params = {}
         return HLR().load(self.request('lookup/' + str(phonenumber) + '/hlr', 'POST', params))
 
     def verify(self, id):
@@ -261,7 +266,8 @@ def verify(self, id):
 
     def verify_create(self, recipient, params=None):
         """Create a new verification."""
-        if params is None: params = {}
+        if params is None:
+            params = {}
         params.update({'recipient': recipient})
         return Verify().load(self.request('verify', 'POST', params))
 
@@ -278,7 +284,8 @@ def contact(self, id):
         return Contact().load(self.request('contacts/' + str(id)))
 
     def contact_create(self, phonenumber, params=None):
-        if params is None: params = {}
+        if params is None:
+            params = {}
         params.update({'msisdn': phonenumber})
         return Contact().load(self.request('contacts', 'POST', params))
 
@@ -296,7 +303,8 @@ def group(self, id):
         return Group().load(self.request('groups/' + str(id), 'GET', None))
 
     def group_create(self, name, params=None):
-        if params is None: params = {}
+        if params is None:
+            params = {}
         params.update({'name': name})
         return Group().load(self.request('groups', 'POST', params))
 
@@ -308,7 +316,8 @@ def group_list(self, limit=10, offset=0):
         return GroupList().load(self.request('groups?' + query, 'GET', None))
 
     def group_update(self, id, name, params=None):
-        if params is None: params = {}
+        if params is None:
+            params = {}
         params.update({'name': name})
         self.request_plain_text('groups/' + str(id), 'PATCH', params)
 
@@ -383,49 +392,40 @@ def conversation_read_webhook(self, id):
         return ConversationWebhook().load(self.request(uri, 'GET', None, CONVERSATION_TYPE))
 
     def voice_recording_list_recordings(self, call_id, leg_id):
-        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/' + str(call_id) + '/' + VOICE_LEGS_PATH + '/' + \
-              str(leg_id) + '/' + VOICE_RECORDINGS_PATH
+        uri = self.generate_voice_calls_url(call_id=call_id, leg_id=leg_id)
         return VoiceRecordingsList().load(self.request(uri, 'GET'))
 
     def voice_transcription_list(self, call_id, leg_id, recording_id):
         """List voice transcriptions."""
-        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/' + str(call_id) + '/' + VOICE_LEGS_PATH + '/' + \
-              str(leg_id) + '/' + VOICE_RECORDINGS_PATH + '/' + str(recording_id) + '/' + VOICE_TRANSCRIPTIONS_PATH
+        uri = self.generate_voice_calls_url(call_id, leg_id, recording_id)
         return VoiceTranscriptionsList().load(self.request(uri, 'GET'))
 
     def voice_transcription_download(self, call_id, leg_id, recording_id, transcriptions_file):
         """Download voice transcription file."""
-        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/' + str(call_id) + '/' + VOICE_LEGS_PATH + '/' + \
-              str(leg_id) + '/' + VOICE_RECORDINGS_PATH + '/' + \
-              str(recording_id) + '/' + VOICE_TRANSCRIPTIONS_PATH + '/' + str(transcriptions_file)
+        uri = self.generate_voice_calls_url(call_id, leg_id, recording_id) + '/' + str(transcriptions_file)
         return self.request(uri, 'GET')
 
     def voice_transcription_view(self, call_id, leg_id, recording_id, transcriptions_id):
         """Get voice transcription data."""
-        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/' + str(call_id) + '/' + VOICE_LEGS_PATH + '/' + \
-              str(leg_id) + '/' + VOICE_RECORDINGS_PATH + '/' + \
-              str(recording_id) + '/' + VOICE_TRANSCRIPTIONS_PATH + '/' + str(transcriptions_id)
+        uri = self.generate_voice_calls_url(call_id, leg_id, recording_id) + '/' + str(transcriptions_id)
         return VoiceTranscriptionsView().load(self.request(uri, 'GET'))
 
     def voice_transcription_create(self, call_id, leg_id, recording_id, language):
         """Create a voice transcription."""
-        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/' + str(call_id) + '/' + VOICE_LEGS_PATH + '/' + \
-              str(leg_id) + '/' + VOICE_RECORDINGS_PATH + '/' + str(recording_id) + '/' + VOICE_TRANSCRIPTIONS_PATH
+        uri = self.generate_voice_calls_url(call_id, leg_id, recording_id)
         params = {'language': str(language)}
         return VoiceTranscriptionsView().load(self.request(uri, 'POST', params, VOICE_TYPE))
 
     def voice_recording_view(self, call_id, leg_id, recording_id):
-        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/' + str(call_id) + '/' + VOICE_LEGS_PATH + '/' + str(
-            leg_id) + '/' + VOICE_RECORDINGS_PATH + '/' + str(recording_id)
+        uri = self.generate_voice_calls_url(call_id=call_id, leg_id=leg_id) + '/' + str(recording_id)
         recording_response = self.request(uri, 'GET')
         recording_links = recording_response.get('_links')
         if recording_links is not None:
             recording_response['data'][0]['_links'] = recording_links
         return VoiceRecording().load(recording_response['data'][0])
 
     def voice_recording_download(self, call_id, leg_id, recording_id):
-        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/' + str(call_id) + '/' + VOICE_LEGS_PATH + '/' + str(
-            leg_id) + '/' + VOICE_RECORDINGS_PATH + '/' + str(recording_id)
+        uri = self.generate_voice_calls_url(call_id=call_id, leg_id=leg_id) + '/' + str(recording_id)
         recording_response = self.request(uri, 'GET')
         recording_links = recording_response.get('_links')
         if recording_links is None or recording_links.get('file') is None:
@@ -497,3 +497,11 @@ def call_flow_numbers_add(self, call_flow_id, numbers=()):
 
     def _format_query(self, limit, offset):
         return 'limit=' + str(limit) + '&offset=' + str(offset)
+
+    @staticmethod
+    def generate_voice_calls_url(call_id=None, leg_id=None, recording_id=None):
+        uri = VOICE_API_ROOT + '/' + VOICE_PATH + '/'
+        uri += str(call_id) + '/' + VOICE_LEGS_PATH + '/' + str(leg_id) + '/' + VOICE_RECORDINGS_PATH
+        if recording_id:
+            uri += '/' + str(recording_id) + '/' + VOICE_TRANSCRIPTIONS_PATH
+        return uri

messagebird/conversation_webhook.py

@@ -44,6 +44,7 @@ def __str__(self):
             'updated date time : %s' % self.updatedDatetime
         ])
 
+
 class ConversationWebhookList(Base):
     def __init__(self):
         self.offset = None

messagebird/formats.py

@@ -1,8 +1,9 @@
 from messagebird.base import Base
 
+
 class Formats(Base):
-  def __init__(self):
-    self.e164             = None
-    self.international    = None
-    self.national         = None
-    self.rfc3966          = None
+    def __init__(self):
+        self.e164 = None
+        self.international = None
+        self.national = None
+        self.rfc3966 = None

messagebird/hlr.py

@@ -1,29 +1,30 @@
 from messagebird.base import Base
 
+
 class HLR(Base):
-  def __init__(self):
-    self.id               = None
-    self.href             = None
-    self.msisdn           = None
-    self.network          = None
-    self.reference        = None
-    self.status           = None
-    self.details          = None
-    self._createdDatetime = None
-    self._statusDatetime  = None
+    def __init__(self):
+        self.id = None
+        self.href = None
+        self.msisdn = None
+        self.network = None
+        self.reference = None
+        self.status = None
+        self.details = None
+        self._createdDatetime = None
+        self._statusDatetime = None
 
-  @property
-  def createdDatetime(self):
-    return self._createdDatetime
+    @property
+    def createdDatetime(self):
+        return self._createdDatetime
 
-  @createdDatetime.setter
-  def createdDatetime(self, value):
-    self._createdDatetime = self.value_to_time(value)
+    @createdDatetime.setter
+    def createdDatetime(self, value):
+        self._createdDatetime = self.value_to_time(value)
 
-  @property
-  def statusDatetime(self):
-    return self._statusDatetime
+    @property
+    def statusDatetime(self):
+        return self._statusDatetime
 
-  @statusDatetime.setter
-  def statusDatetime(self, value):
-    self._statusDatetime = self.value_to_time(value)
+    @statusDatetime.setter
+    def statusDatetime(self, value):
+        self._statusDatetime = self.value_to_time(value)

messagebird/http_client.py

@@ -26,7 +26,8 @@ def __init__(self, endpoint, access_key, user_agent):
 
     def request(self, path, method='GET', params=None, format=ResponseFormat.text):
         """Builds a request and gets a response."""
-        if params is None: params = {}
+        if params is None:
+            params = {}
         url = urljoin(self.endpoint, path)
         headers = {
             'Accept': 'application/json',