Fix utf-8 error on py 2.7

Author: markus

graphql_relay/node/tests/test_global.py

@@ -1,17 +1,12 @@
 from collections import namedtuple
-from pytest import raises
 from graphql import graphql
 from graphql.type import (
     GraphQLSchema,
     GraphQLObjectType,
     GraphQLField,
-    GraphQLArgument,
     GraphQLList,
-    GraphQLNonNull,
     GraphQLInt,
     GraphQLString,
-    GraphQLBoolean,
-    GraphQLID,
 )
 
 from graphql_relay.node.node import (

graphql_relay/node/tests/test_node.py

@@ -1,16 +1,12 @@
 from collections import namedtuple
-from pytest import raises
 from graphql import graphql
 from graphql.type import (
     GraphQLSchema,
     GraphQLObjectType,
     GraphQLField,
-    GraphQLArgument,
-    GraphQLList,
     GraphQLNonNull,
     GraphQLInt,
     GraphQLString,
-    GraphQLBoolean,
     GraphQLID,
 )
 

graphql_relay/tests/__init__.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import base64
+
+from .. import utils
+
+
+def test_base64_encode_unicode_strings_correctly():
+    my_unicode = u'ûñö'
+    my_base64 = utils.base64(my_unicode)
+    assert my_base64 == base64.b64encode(my_unicode.encode('utf-8')).decode('utf-8')
+
+
+def test_base64_encode_strings_correctly():
+    my_string = 'abc'
+    my_base64 = utils.base64(my_string)
+    assert my_base64 == base64.b64encode(my_string.encode('utf-8')).decode('utf-8')
+
+
+def test_unbase64_decodes_unicode_strings_correctly():
+    my_unicode = u'ûñö'
+    my_converted_unicode = utils.unbase64(utils.base64(my_unicode))
+    assert my_unicode == my_converted_unicode
+
+
+def test_unbase64_decodes_strings_correctly():
+    my_string = 'abc'
+    my_converted_string = utils.unbase64(utils.base64(my_string))
+    assert my_string == my_converted_string

graphql_relay/tests/test_utils.py

@@ -1,22 +1,18 @@
 from base64 import b64encode as _base64, b64decode as _unbase64
 
-try:
-    str_type = basestring
-    base64 = _base64
-    unbase64 = _unbase64
+from six import string_types
 
-    def is_str(s):
-        return isinstance(s, basestring)
 
-except NameError:
-    def base64(s):
-        return _base64(bytes(s, 'utf-8')).decode('utf-8')
+def base64(s):
+    return _base64(s.encode('utf-8')).decode('utf-8')
 
-    def unbase64(s):
-        return _unbase64(s).decode('utf-8')
 
-    def is_str(s):
-        return isinstance(s, str)
+def unbase64(s):
+    return _unbase64(s).decode('utf-8')
+
+
+def is_str(s):
+    return isinstance(s, string_types)
 
 
 def resolve_maybe_thunk(f):

graphql_relay/utils.py

@@ -54,6 +54,7 @@ def run_tests(self):
     packages=find_packages(exclude=['tests']),
 
     install_requires=[
+        'six>=1.10.0',
         'graphql-core>=0.5.0',
         'promise>=0.4.0'
     ],

setup.py

@@ -5,6 +5,7 @@ envlist = py27,py33,py34,py35,pypy
 deps=
     pytest>=2.7.2
     django>=1.8.0,<1.9
+    six
     flake8
     singledispatch
 commands=