Convert non-string-ish types to strings

1 files changed, 8 insertions, 0 deletions

diff --git a/uritemplate/template.py b/uritemplate/template.py
index ddfb12a..491464d 100644
--- a/uritemplate/template.py
+++ b/uritemplate/template.py
@@ -16,10 +16,14 @@ What do you do?
 """
 
 import re
+import sys
 from uritemplate.variable import URIVariable
 
 template_re = re.compile('{([^\}]+)}')
 
+if sys.version_info[0] == 3:
+    basestring = (str, bytes)
+
 
 class URITemplate(object):
 
@@ -105,6 +109,10 @@ class URITemplate(object):
 
         expansion = var_dict or {}
         expansion.update(kwargs)
+        for (k, v) in expansion.items():
+            if not isinstance(v, basestring):
+                expansion[k] = str(v)
+
         expanded = {}
         for v in self.variables:
             expanded.update(v.expand(expansion))