# HG changeset patch
# User hodgestar
# Date 1359221691 0
# Node ID 44fb098722ac7e1971cab2d278c212175bd539cd
# Parent  9e30a7234290b6027056d9ad5ab4d0b4371bd86d
Merge r1210 and r1212 from trunk (remove unnecessary isinstance checks and skip mako benchmarks if mako isn't installed).

diff --git a/examples/bench/basic.py b/examples/bench/basic.py
--- a/examples/bench/basic.py
+++ b/examples/bench/basic.py
@@ -40,7 +40,11 @@
     return render
 
 def mako(dirname, verbose=False):
-    from mako.lookup import TemplateLookup
+    try:
+        from mako.lookup import TemplateLookup
+    except ImportError:
+        print>>sys.stderr, 'Mako not installed, skipping'
+        return lambda: None
     lookup = TemplateLookup(directories=[dirname], filesystem_checks=False)
     template = lookup.get_template('template.html')
     def render():
diff --git a/genshi/input.py b/genshi/input.py
--- a/genshi/input.py
+++ b/genshi/input.py
@@ -366,9 +366,7 @@
         fixed_attrib = []
         for name, value in attrib: # Fixup minimized attributes
             if value is None:
-                value = unicode(name)
-            elif not isinstance(value, unicode):
-                value = value.decode(self.encoding, 'replace')
+                value = name
             fixed_attrib.append((QName(name), stripentities(value)))
 
         self._enqueue(START, (QName(tag), Attrs(fixed_attrib)))
@@ -386,8 +384,6 @@
                     break
 
     def handle_data(self, text):
-        if not isinstance(text, unicode):
-            text = text.decode(self.encoding, 'replace')
         self._enqueue(TEXT, text)
 
     def handle_charref(self, name):