Merge pull request mikeboers#10 from epegzz/master

pull request: unicode support in haml function arguments

haml/codegen.py

@@ -153,7 +153,7 @@ def adapt_camelcase(name, seperator):
 def _format_mako_attr_pair(k, v):
     if v is True:
         v = k
-    return ' %s="%s"' % (k, cgi.escape(str(v)))
+    return ' %s="%s"' % (k, cgi.escape("%s" % v))
 
 
 

haml/util.py

@@ -0,0 +1,14 @@
+
+
+def extract_haml(fileobj, keywords, comment_tags, options):
+    """ babel translation token extract function for haml files """
+
+    import haml
+    from mako import lexer, parsetree
+    from mako.ext.babelplugin import extract_nodes 
+
+    encoding = options.get('input_encoding', options.get('encoding', None))
+    template_node = lexer.Lexer(haml.preprocessor(fileobj.read()), input_encoding=encoding).parse()
+    for extracted in extract_nodes(template_node.get_children(), keywords, comment_tags, options):
+        yield extracted
+

tests/test_pythonisms.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from . import Base
 
 class TestAttributes(Base):
+
 
     def test_raw_attribute_names(self):
         self.assertHTML(
@@ -19,4 +21,10 @@ def test_camelcase_override(self):
             '%({"positionalDict":"xxx"}, keywordArgument="xxx", __adapt_camelcase=False, **{"expandedDict":"xxx"}) content',
             '<div expandedDict="xxx" keywordArgument="xxx" positionalDict="xxx">content</div>\n'
         )
-
+
+    def test_unicode_arguments(self):
+        self.assertHTML(
+            u'%(a=u"España") content',
+            u'<div a="España">content</div>\n'
+        )
+