Changeset 1221

Timestamp:

Jan 26, 2013, 6:34:51 PM (11 years ago)

Author:

hodgestar

Message:

Merge r1210 and r1212 from trunk (remove unnecessary isinstance checks and skip mako benchmarks if mako isn't installed).

Location:

branches/stable/0.7.x

Files:

• . (modified) (1 prop)
• examples/bench/basic.py (modified) (1 diff)
• genshi/input.py (modified) (2 diffs)

branches/stable/0.7.x/examples/bench/basic.py

@@ -41 +41 @@
 
 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')

branches/stable/0.7.x/genshi/input.py

@@ -367 +367 @@
         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)))
 
@@ -387 +385 @@
 
     def handle_data(self, text):
-        if not isinstance(text, unicode):
-            text = text.decode(self.encoding, 'replace')
         self._enqueue(TEXT, text)