Merge 'issue_57' into development: update docstrings and history notes.

HISTORY.rst

@@ -10,6 +10,9 @@ Features:
 * A custom template loader can now be passed to a View. [cjerdonek]
 * Added a command-line interface. [vrde, cjerdonek]
 * Markupsafe can now be disabled after import. [cjerdonek]
+* Template class can now handle non-ascii characters in non-unicode strings.
+  Added default_encoding and decode_errors to Template constructor arguments.
+  [cjerdonek]
 
 API changes:
 

pystache/template.py

@@ -68,8 +68,9 @@ class Template(object):
 
         Arguments:
 
-          template: a template string as a unicode string.  Behavior is
-            undefined if the string has type str.
+          template: a template string that is either unicode, or of type
+            str and encoded using the encoding named by the default_encoding
+            keyword argument.
 
           load_template: the function for loading partials.  The function should
             accept a single template_name parameter and return a template as
@@ -362,6 +363,10 @@ class Template(object):
         attribute has been set to a non-None value, in which case the
         return value has type str and is encoded using that encoding.
 
+        If the template string is not unicode, it is first converted to
+        unicode using the default_encoding and decode_errors attributes.
+        See the Template constructor's docstring for more information.
+
         Arguments:
 
           context: a dictionary, Context, or object (e.g. a View instance).