Use six instead of graphql.core.compat.

Closes #13

Author: jhgg

graphql/core/compat.py

@@ -61,7 +61,7 @@
 # THE SOFTWARE.
 import collections
 import sys
-from graphql.core.compat import PY3
+from six import reraise
 
 __all__ = ("Deferred", "AlreadyCalledDeferred", "DeferredException",
            "defer", "succeed", "fail", "DeferredDict", "DeferredList")
@@ -107,14 +107,9 @@ def __init__(self, type=None, value=None, traceback=None):
         elif not type or not value:
             self.type, self.value, self.traceback = sys.exc_info()
 
-    if PY3:
-        def raise_exception(self):
-            """Raise the stored exception."""
-            raise self.type(self.value).with_traceback(self.traceback)
-
-    else:
-        exec("""def raise_exception(self):
-    raise self.type, self.value, self.traceback""")
+    def raise_exception(self):
+        """Raise the stored exception."""
+        reraise(self.type, self.value, self.traceback)
 
     def catch(self, *errors):
         """Check if the stored exception is a subclass of one of the

graphql/core/defer.py

@@ -1,5 +1,5 @@
 import collections
-from ..compat import str_type
+from six import string_types
 from ..error import GraphQLError
 from ..language.printer import print_ast
 from ..type import (
@@ -103,7 +103,7 @@ def is_valid_value(type, value):
 
     if isinstance(type, GraphQLList):
         item_type = type.of_type
-        if not isinstance(value, str_type) and \
+        if not isinstance(value, string_types) and \
                 isinstance(value, collections.Iterable):
             return all(is_valid_value(item_type, item) for item in value)
         else:
@@ -143,7 +143,7 @@ def coerce_value(type, value):
 
     if isinstance(type, GraphQLList):
         item_type = type.of_type
-        if not isinstance(value, str_type) and isinstance(value, collections.Iterable):
+        if not isinstance(value, string_types) and isinstance(value, collections.Iterable):
             return [coerce_value(item_type, item) for item in value]
         else:
             return [coerce_value(item_type, value)]

graphql/core/execution/values.py

@@ -1,5 +1,5 @@
 import json
-from ..compat import unichr
+from six import unichr
 from .error import LanguageError
 
 __all__ = ['Token', 'Lexer', 'TokenKind',

graphql/core/language/lexer.py

@@ -1,5 +1,5 @@
+from six import string_types
 from . import ast
-from ..compat import str_type
 from .error import LanguageError
 from .lexer import Lexer, TokenKind, get_token_desc, get_token_kind_desc
 from .source import Source
@@ -13,7 +13,7 @@ def parse(source, **kwargs):
     options.update(kwargs)
     source_obj = source
 
-    if isinstance(source, str_type):
+    if isinstance(source, string_types):
         source_obj = Source(source)
 
     parser = Parser(source_obj, options)
@@ -25,7 +25,7 @@ def parse_value(source, **kwargs):
     options.update(kwargs)
     source_obj = source
 
-    if isinstance(source, str_type):
+    if isinstance(source, string_types):
         source_obj = Source(source)
 
     parser = Parser(source_obj, options)

graphql/core/language/parser.py

@@ -1,7 +1,8 @@
 import json
 import re
 import sys
-from ..compat import str_type
+
+from six import string_types
 from ..language import ast
 from ..type.definition import (
     GraphQLEnumType,
@@ -43,7 +44,7 @@ def ast_from_value(value, type=None):
 
         return ast.FloatValue(string_num)
 
-    if isinstance(value, str_type):
+    if isinstance(value, string_types):
         if isinstance(type, GraphQLEnumType) and re.match(r'^[_a-zA-Z][_a-zA-Z0-9]*$', value):
             return ast.EnumValue(value)