changeset 458:f04fafdd629f

branch merged with main repo
author Akash Sinha <akash2607@gmail.com>
date Wed, 01 Jun 2011 15:18:02 +0530
parents f1f88b7b17fa (current diff) 5028c04190a9 (diff)
children a4afec9ff526
files
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/converter/html_out.py	Tue May 31 02:11:55 2011 +0530
+++ b/MoinMoin/converter/html_out.py	Wed Jun 01 15:18:02 2011 +0530
@@ -344,13 +344,9 @@
         else:
             # Nothing else worked...try using <object>
             return "object"
+
     def visit_moinpage_object(self, elem):
         href = elem.get(xlink.href, None)
-        if href:
-            if isinstance(href, unicode): # XXX sometimes we get Iri, sometimes unicode - bug?
-                h = href
-            else: # Iri
-                h = href.path[-1] # XXX BUG Iri doesn't have a path if we access the root page (eg. http://google.de doesn't have a path)
         attrib = {}
         mimetype = Type(_type=elem.get(moin_page.type_, 'application/x-nonexistent'))
         # Get the object type