Merge pull request #14 from hballard/2to3

Make package compatible w/ python 3 and python 2.

Author: hballard

README.md

@@ -6,7 +6,7 @@ This is an implementation of graphql subscriptions in Python.  It uses the apoll
 
 Meant to be used in conjunction with [graphql-python](https://github.com/graphql-python) / [graphene](http://graphene-python.org/) server and [apollo-client](http://dev.apollodata.com/) for graphql.  The api is below, but if you want more information, consult the apollo graphql libraries referenced above, and specifcally as it relates to using their graphql subscriptions client.
 
-Initial implementation.  Good test coverage.  Currently only works with Python 2.
+Initial implementation.  Good test coverage.  Works with both Python 2 / 3.
 
 ## Installation
 ```

graphql_subscriptions/__init__.py

@@ -1,5 +1,6 @@
-from subscription_manager import RedisPubsub, SubscriptionManager
-from subscription_transport_ws import SubscriptionServer
+from __future__ import absolute_import
+from .subscription_manager import RedisPubsub, SubscriptionManager
+from .subscription_transport_ws import SubscriptionServer
 
 __all__ = ['RedisPubsub', 'SubscriptionManager', 'SubscriptionServer']
 

graphql_subscriptions/subscription_manager.py

@@ -1,5 +1,8 @@
-import cPickle
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
 from types import FunctionType
+import pickle
 
 from graphql import parse, validate, specified_rules, value_from_ast, execute
 from graphql.language.ast import OperationDefinition
@@ -21,13 +24,13 @@ def __init__(self, host='localhost', port=6379, *args, **kwargs):
         self.greenlet = None
 
     def publish(self, trigger_name, message):
-        self.redis.publish(trigger_name, cPickle.dumps(message))
+        self.redis.publish(trigger_name, pickle.dumps(message))
         return True
 
     def subscribe(self, trigger_name, on_message_handler, options):
         self.sub_id_counter += 1
         try:
-            if trigger_name not in self.subscriptions.values()[0]:
+            if trigger_name not in list(self.subscriptions.values())[0]:
                 self.pubsub.subscribe(trigger_name)
         except IndexError:
             self.pubsub.subscribe(trigger_name)
@@ -42,7 +45,7 @@ def unsubscribe(self, sub_id):
         trigger_name, on_message_handler = self.subscriptions[sub_id]
         del self.subscriptions[sub_id]
         try:
-            if trigger_name not in self.subscriptions.values()[0]:
+            if trigger_name not in list(self.subscriptions.values())[0]:
                 self.pubsub.unsubscribe(trigger_name)
         except IndexError:
             self.pubsub.unsubscribe(trigger_name)
@@ -57,9 +60,11 @@ def wait_and_get_message(self):
             gevent.sleep(.001)
 
     def handle_message(self, message):
-        for sub_id, trigger_map in self.subscriptions.iteritems():
-            if trigger_map[0] == message['channel']:
-                trigger_map[1](cPickle.loads(message['data']))
+        if isinstance(message['channel'], bytes):
+            channel = message['channel'].decode()
+        for sub_id, trigger_map in self.subscriptions.items():
+            if trigger_map[0] == channel:
+                trigger_map[1](pickle.loads(message['data']))
 
 
 class ValidationError(Exception):
@@ -105,7 +110,7 @@ def subscribe(self, query, operation_name, callback, variables, context,
                     arg_definition = [
                         arg_def
                         for _, arg_def in fields.get(subscription_name)
-                        .args.iteritems() if arg_def.out_name == arg.name.value
+                        .args.items() if arg_def.out_name == arg.name.value
                     ][0]
 
                     args[arg_definition.out_name] = value_from_ast(
@@ -131,20 +136,20 @@ def subscribe(self, query, operation_name, callback, variables, context,
         self.subscriptions[external_subscription_id] = []
         subscription_promises = []
 
-        for trigger_name in trigger_map.viewkeys():
+        for trigger_name in trigger_map.keys():
             try:
                 channel_options = trigger_map[trigger_name].get(
                     '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
 

graphql_subscriptions/subscription_transport_ws.py

@@ -1,7 +1,8 @@
-import json
-import gevent
+from builtins import str
 from geventwebsocket import WebSocketApplication
 from promise import Promise
+import gevent
+import json
 
 SUBSCRIPTION_FAIL = 'subscription_fail'
 SUBSCRIPTION_END = 'subscription_end'
@@ -66,7 +67,7 @@ def keep_alive_callback():
                                             self.keep_alive)
 
     def on_close(self, reason):
-        for sub_id in self.connection_subscriptions.keys():
+        for sub_id in list(self.connection_subscriptions.keys()):
             self.unsubscribe(self.connection_subscriptions[sub_id])
             del self.connection_subscriptions[sub_id]
 
@@ -159,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:
@@ -187,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

setup.py

@@ -1,4 +1,5 @@
 from setuptools import setup, find_packages
+import sys
 
 try:
     import pypandoc
@@ -7,13 +8,16 @@
     long_description = open('README.md').read()
 
 tests_dep = [
-    'pytest', 'pytest-mock', 'fakeredis', 'graphene', 'subprocess32',
+    'pytest', 'pytest-mock', 'fakeredis', 'graphene',
     'flask', 'flask-graphql', 'flask-sockets', 'multiprocess', 'requests'
 ]
 
+if sys.version_info[0] < 3:
+    tests_dep.append('subprocess32')
+
 setup(
     name='graphql-subscriptions',
-    version='0.1.8',
+    version='0.1.9',
     author='Heath Ballard',
     author_email='[email protected]',
     description=('A port of apollo-graphql subscriptions for python, using\
@@ -29,10 +33,14 @@
         'Environment :: Web Environment',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'License :: OSI Approved :: MIT License'
     ],
     install_requires=[
-        'gevent-websocket', 'redis', 'graphql-core', 'promise<=1.0.1'
+        'gevent-websocket', 'redis', 'graphql-core', 'promise<=1.0.1', 'future'
     ],
     test_suite='pytest',
     tests_require=tests_dep,

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)