Mercurial > genshi > mirror
changeset 998:44fb098722ac stable-0.7.x
Merge r1210 and r1212 from trunk (remove unnecessary isinstance checks and skip mako benchmarks if mako isn't installed).
| author | hodgestar |
|---|---|
| date | Sat, 26 Jan 2013 17:34:51 +0000 |
| parents | 9e30a7234290 |
| children | 0891de2f3786 |
| files | examples/bench/basic.py genshi/input.py |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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():
--- 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):