From 6335479135681b911ca8c46473e299b82830c016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Wed, 9 Nov 2005 17:57:05 +0000
Subject: [PATCH] * all right, get things to work again :) the old mdom
 implementation loads now

---
 pisi/metadata.py        | 4 ++--
 pisi/xml/autoxml.py     | 4 ++--
 pisi/xml/xmlextmdom.py  | 2 ++
 pisi/xml/xmlfilemdom.py | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pisi/metadata.py b/pisi/metadata.py
index 8d42d786..9ac9fb7d 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -25,7 +25,7 @@ _ = __trans.ugettext
 
 import pisi.context as ctx
 import pisi.specfile as specfile
-import pisi.xmlfile as xmlfile
+import pisi.xml.xmlfile as xmlfile
 import pisi.xml.autoxml as autoxml
 import pisi.util as util
 
@@ -58,7 +58,7 @@ class Package(specfile.Package):
             (self.architecture, self.installedSize)
         return s
 
-class MetaData(autoxml.XmlFile):
+class MetaData(xmlfile.XmlFile):
     """Package metadata. Metadata is composed of Specfile and various
     other information. A metadata has two parts, Source and Package."""
 
diff --git a/pisi/xml/autoxml.py b/pisi/xml/autoxml.py
index 45ec0467..9f47f548 100644
--- a/pisi/xml/autoxml.py
+++ b/pisi/xml/autoxml.py
@@ -41,8 +41,8 @@ _ = __trans.ugettext
 # PiSi
 import pisi
 # TODO: find the appropriate xmlext implementation and import from there
-from pisi.xmlext import *
-from pisi.xmlfile import XmlFile
+from pisi.xml.xmlext import *
+from pisi.xml.xmlfile import XmlFile
 import pisi.context as ctx
 import pisi.util as util
 import pisi.oo as oo
diff --git a/pisi/xml/xmlextmdom.py b/pisi/xml/xmlextmdom.py
index e82e12ba..caeafff7 100644
--- a/pisi/xml/xmlextmdom.py
+++ b/pisi/xml/xmlextmdom.py
@@ -31,6 +31,8 @@ import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
+import xml.dom.minidom as mdom
+
 import pisi
 
 class XmlError(pisi.Error):
diff --git a/pisi/xml/xmlfilemdom.py b/pisi/xml/xmlfilemdom.py
index a8f44593..a7a8ce27 100644
--- a/pisi/xml/xmlfilemdom.py
+++ b/pisi/xml/xmlfilemdom.py
@@ -28,6 +28,9 @@ import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
+import xml.dom.minidom as mdom
+import codecs
+
 import pisi
 
 class Error(pisi.Error):