diff --git a/pisi-cli b/pisi-cli index 8b645bb6..c5a5d119 100755 --- a/pisi-cli +++ b/pisi-cli @@ -26,7 +26,7 @@ _ = __trans.ugettext def handle_exception(exception, value, tb): ui = pisi.cli.CLI() # make a temporary UI - show_traceback = False + show_traceback = True if exception == exceptions.KeyboardInterrupt: ui.error(_("Keyboard Interrupt: Exiting...")) sys.exit(1) diff --git a/pisi/xml/xmlext.py b/pisi/xml/xmlext.py index cfc0cde8..ea7dbdeb 100644 --- a/pisi/xml/xmlext.py +++ b/pisi/xml/xmlext.py @@ -20,3 +20,8 @@ except: except: print 'xmlext: cDomlette/piksemel implementation cannot be loaded, falling back to minidom' from xmlextmdom import * + + +from xml.dom import XHTML_NAMESPACE, XML_NAMESPACE +XHTML_NS = unicode(XHTML_NAMESPACE) +XML_NS = unicode(XML_NAMESPACE) diff --git a/pisi/xml/xmlextcdom.py b/pisi/xml/xmlextcdom.py index 8aae2aab..ae713679 100644 --- a/pisi/xml/xmlextcdom.py +++ b/pisi/xml/xmlextcdom.py @@ -35,10 +35,6 @@ import Ft from Ft.Xml.Domlette import implementation from Ft.Xml import ParsePath from Ft.Xml.Domlette import NonvalidatingReader -from xml.dom import XHTML_NAMESPACE, XML_NAMESPACE - -XHTML_NS = unicode(XHTML_NAMESPACE) -XML_NS = unicode(XML_NAMESPACE) import pisi