Fix handling of unicode values for Python 2

Closes #19

2 files changed, 28 insertions, 10 deletions

diff --git a/tests/test_from_fixtures.py b/tests/test_from_fixtures.py
index 0ecc075..55187e2 100644
--- a/tests/test_from_fixtures.py
+++ b/tests/test_from_fixtures.py
@@ -102,8 +102,6 @@ class TestSpecExamplesByRFCSection(FixtureMixin):
 class TestExtendedTests(FixtureMixin):
     examples = load_examples('extended-tests')
 
-    @pytest.mark.xfail(sys.version_info < (3, 0),
-                       reason='See bug #19')
     def test_additional_examples_1(self):
         """Check Additional Examples 1."""
         self._test('Additional Examples 1')
@@ -116,8 +114,6 @@ class TestExtendedTests(FixtureMixin):
         """Check Additional Examples 3."""
         self._test('Additional Examples 3: Empty Variables')
 
-    @pytest.mark.xfail(sys.version_info < (3, 0),
-                       reason='See bug #19')
     def test_additional_examples_4(self):
         """Check Additional Examples 4."""
         self._test('Additional Examples 4: Numeric Keys')
diff --git a/uritemplate/variable.py b/uritemplate/variable.py
index a47bf0a..1842830 100644
--- a/uritemplate/variable.py
+++ b/uritemplate/variable.py
@@ -15,12 +15,13 @@ What do you do?
 
 """
 
-try:
-    from urllib import quote
-except ImportError:
-    # python 3
-    from urllib.parse import quote
 import collections
+import sys
+
+if (2, 6) <= sys.version_info < (2, 8):
+    import urllib
+elif (3, 3) <= sys.version_info < (4, 0):
+    import urllib.parse as urllib
 
 
 class URIVariable(object):
@@ -174,7 +175,7 @@ class URIVariable(object):
 
         if value:
             value = value[:prefix] if prefix else value
-            return '%s=%s' % (name, quote(str(value), safe))
+            return '%s=%s' % (name, quote(value, safe))
         return name + '='
 
     def _label_path_expansion(self, name, value, explode, prefix):
@@ -360,3 +361,24 @@ def list_test(value):
 
 def dict_test(value):
     return isinstance(value, (dict, collections.MutableMapping))
+
+
+try:
+    texttype = unicode
+except NameError:  # Python 3
+    texttype = str
+
+stringlikes = (texttype, bytes)
+
+
+def _encode(value, encoding='utf-8'):
+    if (isinstance(value, texttype) and
+            getattr(value, 'encode', None) is not None):
+        return value.encode(encoding)
+    return value
+
+
+def quote(value, safe):
+    if not isinstance(value, stringlikes):
+        value = str(value)
+    return urllib.quote(_encode(value), safe)