All tests now pass for python 3.6

except 1 test -- which is same as python 2.7

Author: hballard

graphql_subscriptions/subscription_manager.py

@@ -1,6 +1,5 @@
 from future import standard_library
 standard_library.install_aliases()
-from builtins import filter
 from builtins import object
 from types import FunctionType
 import pickle
@@ -61,8 +60,10 @@ def wait_and_get_message(self):
             gevent.sleep(.001)
 
     def handle_message(self, message):
+        if isinstance(message['channel'], bytes):
+            channel = message['channel'].decode()
         for sub_id, trigger_map in self.subscriptions.items():
-            if trigger_map[0] == message['channel']:
+            if trigger_map[0] == channel:
                 trigger_map[1](pickle.loads(message['data']))
 
 
@@ -141,14 +142,14 @@ def subscribe(self, query, operation_name, callback, variables, context,
                     'channel_options', {})
                 filter = trigger_map[trigger_name].get('filter',
                                                        lambda arg1, arg2: True)
-            # TODO: Think about this some more...the Apollo library
-            # let's all messages through by default, even if
-            # the users incorrectly uses the setup_funcs (does not
-            # use 'filter' or 'channel_options' keys); I think it
-            # would be better to raise an exception here
             except AttributeError:
                 channel_options = {}
 
+                # TODO: Think about this some more...the Apollo library
+                # let's all messages through by default, even if
+                # the users incorrectly uses the setup_funcs (does not
+                # use 'filter' or 'channel_options' keys); I think it
+                # would be better to raise an exception here
                 def filter(arg1, arg2):
                     return True
 
@@ -160,7 +161,7 @@ def context_promise_handler(result):
                         return context
 
                 def filter_func_promise_handler(context):
-                    return Promise.all([context, list(filter(root_value, context))])
+                    return Promise.all([context, filter(root_value, context)])
 
                 def context_do_execute_handler(result):
                     context, do_execute = result

graphql_subscriptions/subscription_transport_ws.py

@@ -160,16 +160,17 @@ def promised_params_handler(params):
                             raise TypeError(error)
 
                         def params_callback(error, result):
+                            # import ipdb; ipdb.set_trace()
                             if not error:
                                 self.send_subscription_data(
                                     sub_id, {'data': result.data})
-                            elif error.message:
+                            elif hasattr(error, 'message'):
                                 self.send_subscription_data(
                                     sub_id,
                                     {'errors': [{
                                         'message': error.message
                                     }]})
-                            elif error.errors:
+                            elif hasattr(error, 'errors'):
                                 self.send_subscription_data(
                                     sub_id, {'errors': error.errors})
                             else:
@@ -188,10 +189,10 @@ def graphql_sub_id_promise_handler(graphql_sub_id):
                         self.send_subscription_success(sub_id)
 
                     def error_catch_handler(e):
-                        if e.errors:
+                        if hasattr(e, 'errors'):
                             self.send_subscription_fail(
                                 sub_id, {'errors': e.errors})
-                        elif e.message:
+                        elif hasattr(e, 'message'):
                             self.send_subscription_fail(
                                 sub_id, {'errors': [{
                                     'message': e.message

tests/test_subscription_manager.py

@@ -451,7 +451,7 @@ def test_calls_the_error_callback_if_context_func_throws_error(sub_mgr):
     def callback(err, payload):
         try:
             assert payload is None
-            assert err.message == 'context error'
+            assert str(err) == 'context error'
             sub_mgr.pubsub.greenlet.kill()
         except AssertionError as e:
             sys.exit(e)