Make several minor changes to subcription_transport

Modified "nonlocal" class to "non_local" dict and changed
parameter['context'] defination statement

Author: hballard

graphql_subscriptions/subscription_transport_ws.py

@@ -77,11 +77,11 @@ def on_message(self, msg):
         if msg is None:
             return
 
-        nonlocal = {'on_init_resolve': None, 'on_init_reject': None}
+        non_local = {'on_init_resolve': None, 'on_init_reject': None}
 
         def init_promise_handler(resolve, reject):
-            nonlocal['on_init_resolve'] = resolve
-            nonlocal['on_init_reject'] = reject
+            non_local['on_init_resolve'] = resolve
+            non_local['on_init_reject'] = reject
 
         self.connection_context['init_promise'] = Promise(init_promise_handler)
 
@@ -105,7 +105,7 @@ def on_message_return_handler(message):
                         self.on_connect(
                             parsed_message.get('payload'), self.ws))
 
-                nonlocal['on_init_resolve'](on_connect_promise)
+                non_local['on_init_resolve'](on_connect_promise)
 
                 def init_success_promise_handler(result):
                     if not result:
@@ -131,7 +131,8 @@ def subscription_start_promise_handler(init_result):
                         'callback': None,
                         'variables': parsed_message.get('variables'),
                         'context': init_result if isinstance(
-                            init_result, dict) else {},
+                            init_result, dict) else
+                            parsed_message.get('context', {}),
                         'format_error': None,
                         'format_response': None
                     }
@@ -149,8 +150,7 @@ def subscription_start_promise_handler(init_result):
                     def promised_params_handler(params):
                         if not isinstance(params, dict):
                             error = 'Invalid params returned from\
-                                    OnSubscribe!  Return value must\
-                                    be an dict'
+OnSubscribe!  Return value must be an dict'
 
                             self.send_subscription_fail(
                                 sub_id, {'errors': [{
@@ -162,15 +162,15 @@ def params_callback(error, result):
                             if not error:
                                 self.send_subscription_data(
                                     sub_id, {'data': result.data})
-                            elif error.errors:
-                                self.send_subscription_data(
-                                    sub_id, {'errors': error.errors})
                             elif error.message:
                                 self.send_subscription_data(
                                     sub_id,
                                     {'errors': [{
                                         'message': error.message
                                     }]})
+                            elif error.errors:
+                                self.send_subscription_data(
+                                    sub_id, {'errors': error.errors})
                             else:
                                 self.send_subscription_data(
                                     sub_id,
@@ -216,7 +216,7 @@ def error_catch_handler(e):
                 # not sure if this behavior is correct or
                 # not per promises A spec...need to
                 # investigate
-                nonlocal['on_init_resolve'](Promise.resolve(True))
+                non_local['on_init_resolve'](Promise.resolve(True))
 
                 self.connection_context['init_promise'].then(
                     subscription_start_promise_handler)
@@ -229,7 +229,7 @@ def subscription_end_promise_handler(result):
                         del self.connection_subscriptions[sub_id]
 
                 # same rationale as above
-                nonlocal['on_init_resolve'](Promise.resolve(True))
+                non_local['on_init_resolve'](Promise.resolve(True))
 
                 self.connection_context['init_promise'].then(
                     subscription_end_promise_handler)