getting py2 working...

README.rst

@@ -1,6 +1,13 @@
 SOQL
 ====
 
+.. image:: https://travis-ci.org/plangrid/soql.svg?branch=master
+   :target: https://travis-ci.org/plangrid/soql
+   :alt: CI Status
+
+.. image:: https://badge.fury.io/py/soql.svg
+   :target: https://badge.fury.io/py/soql
+   :alt: PyPI status
 
 |
 

requirements.txt

@@ -1 +1,3 @@
+pytest
+
 -e .

soql/attributes.py

@@ -10,7 +10,6 @@
 from __future__ import absolute_import
 from datetime import datetime, date
 
-import six
 from dateutil.parser import parse
 from dateutil.tz import tzutc
 
@@ -112,9 +111,10 @@ def serialize(self, value):
 
 class String(Column):
     def _coerce(self, value):
-        if not isinstance(value, six.string_types):
-            value = str(value)
-        return six.u(value)
+        try:
+            return str(value)
+        except UnicodeEncodeError:
+            return value
 
 
 class Integer(Column):

soql/nodes.py

@@ -16,6 +16,7 @@
 from dateutil.tz import tzutc
 
 from soql.utils import AttrDict
+from soql.utils import to_unicode
 
 
 # The various operations you can perform in SOQL
@@ -91,17 +92,14 @@ def __init__(self, child_nodes, sep=''):
         self.child_nodes = child_nodes
         self.sep = sep
 
-    def as_string(self):
-        return self.sep.join([str(node) for node in self.child_nodes])
+    def _as_string(self, method):
+        return self.sep.join([method(node) for node in self.child_nodes])
 
     def __unicode__(self):
-        return six.u(self.as_string())
+        return to_unicode(self._as_string(to_unicode))
 
     def __str__(self):
-        return str(self.as_string())
-
-    def __bytes__(self):
-        return six.b(self.as_string())
+        return str(self._as_string(str))
 
 
 class Grouped(Node):

soql/path_builder.py

@@ -9,10 +9,9 @@
 """
 from __future__ import absolute_import
 
-import six
-
 from soql.attributes import Relationship
 from soql.nodes import ColumnPath
+from soql.utils import to_unicode
 
 
 class PathBuilder(object):
@@ -145,10 +144,7 @@ def __getattr__(self, item):
         return self.extend_path(item=item)
 
     def __unicode__(self):
-        return six.u(self.get_column_node())
+        return to_unicode(self.get_column_node())
 
     def __str__(self):
         return str(self.get_column_node())
-
-    def __bytes__(self):
-        return six.b(self.get_column_node())

soql/select.py

@@ -12,13 +12,12 @@
 from collections import OrderedDict
 from copy import copy
 
-import six
-
 from soql.nodes import SubqueryClause
 from soql.nodes import OrderByClause
 from soql.nodes import Count
 from soql.nodes import SelectClause
 from soql.path_builder import PathBuilder
+from soql.utils import to_unicode
 
 
 class SelectClauseIsntValidSubquery(Exception):
@@ -195,14 +194,11 @@ def subquery(self):
 
     def __unicode__(self):
         """Converts the instance to a SOQL string."""
-        return six.u(self._get_select_clause())
+        return to_unicode(self._get_select_clause())
 
     def __str__(self):
         return str(self._get_select_clause())
 
-    def __bytes__(self):
-        return six.b(self._get_select_clause())
-
     def _get_columns(self):
         if self._count:
             return [Count()]

soql/utils.py

@@ -7,10 +7,17 @@
     :copyright: Copyright 2018 PlanGrid, Inc., see AUTHORS.
     :license: MIT, see LICENSE for details.
 """
+import sys
 
 
 class AttrDict(dict):
     """This is just a little convenience class to make dealing with
     static sets prettier."""
     def __getattr__(self, attr):
         return self[attr]
+
+
+if sys.version_info[0] < 3:
+    to_unicode = unicode
+else:
+    to_unicode = str

tests/helpers.py

@@ -1,7 +1,6 @@
-import six
+from soql.utils import to_unicode
 
 
 class SoqlAssertions(object):
     def assertSoqlEqual(self, node, soql):
-        self.assertEqual(six.u(str(node)), six.u(soql))
-        self.assertEqual(six.b(str(node)), six.b(soql))
+        self.assertEqual(to_unicode(node), to_unicode(soql))

tests/test_attributes.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import unittest
 from datetime import datetime, date
 
@@ -44,7 +47,7 @@ def test_coerce(self):
         attr = attributes.String('Attr')
         self.assertEqual(attr.coerce(1), '1')
         self.assertEqual(attr.coerce('1'), '1')
-        self.assertEqual(attr.coerce(u'\xe9'), u'\xe9')
+        self.assertEqual(attr.coerce('È'), 'È')
         self.assertRaises(NullSalesforceColumnError, attr.coerce, None)
 
     def test_nullable(self):