pep8 fixes

praekeltfoundation · Jul 11, 2014 · 7b2958e · 7b2958e
1 parent 83aa036
commit 7b2958e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/vxaat/tests/test_ussd.py b/vxaat/tests/test_ussd.py
@@ -53,7 +53,8 @@ def assert_outbound_message(self, msg, content, callback,
         if continue_session:
             options = (
                 '<options>'
-                '<option callback="%s" command="1" display="false" order="1" />'
+                '<option callback="%s" command="1" display="false"'
+                ' order="1" />'
                 '</options>'
             ) % callback
         else:
@@ -82,7 +83,7 @@ def assert_nack(self, nack, reply, reason):
     def test_inbound_begin(self):
 
         # Send initial request
-        d = self.tx_helper.mk_request('')
+        d = self.tx_helper.mk_request()
         [msg] = yield self.tx_helper.wait_for_dispatched_inbound(1)
 
         self.assert_inbound_message(
@@ -109,7 +110,7 @@ def test_inbound_begin(self):
     def test_inbound_begin_with_close(self):
 
         # Send initial request
-        d = self.tx_helper.mk_request('')
+        d = self.tx_helper.mk_request()
         [msg] = yield self.tx_helper.wait_for_dispatched_inbound(1)
 
         self.assert_inbound_message(
@@ -137,7 +138,7 @@ def test_inbound_begin_with_close(self):
     def test_inbound_resume_and_reply_with_end(self):
 
         user_content = "I didn't expect a kind of Spanish Inquisition!"
-        d = self.tx_helper.mk_request('', request=user_content)
+        d = self.tx_helper.mk_request(request=user_content)
         [msg] = yield self.tx_helper.wait_for_dispatched_inbound(1)
         self.assert_inbound_message(
             msg,
@@ -164,7 +165,7 @@ def test_inbound_resume_and_reply_with_end(self):
     def test_inbound_resume_and_reply_with_resume(self):
 
         user_content = "Well, what is it you want?"
-        d = self.tx_helper.mk_request('some-suffix', request=user_content)
+        d = self.tx_helper.mk_request(request=user_content)
         [msg] = yield self.tx_helper.wait_for_dispatched_inbound(1)
         self.assert_inbound_message(
             msg,
@@ -185,4 +186,4 @@ def test_inbound_resume_and_reply_with_resume(self):
         )
 
         [ack] = yield self.tx_helper.wait_for_dispatched_events(1)
-        self.assert_ack(ack, reply)
+        self.assert_ack(ack, reply)
diff --git a/vxaat/ussd.py b/vxaat/ussd.py
@@ -26,6 +26,10 @@ class AatUssdTransport(HttpRpcTransport):
     EXPECTED_FIELDS = set(['msisdn', 'provider'])
     IGNORE_FIELDS = set(['request'])
 
+    # errors
+    RESPONSE_FAILURE_ERROR = "Response to http request failed."
+    INSUFFICIENT_MSG_FIELDS_ERROR = "Insufficiant message fields provided."
+
     CONFIG_CLASS = AatUssdTransportConfig
 
     def get_callback_url(self):
@@ -34,7 +38,6 @@ def get_callback_url(self):
             config.base_url,
             config.web_path)
 
-
     @inlineCallbacks
     def handle_raw_inbound_message(self, message_id, request):
         errors = {}
@@ -133,4 +136,3 @@ def handle_outbound_message(self, message):
 
         yield self.publish_ack(user_message_id=message_id,
                                sent_message_id=message_id)
-