From 15e1b2c4364ffe0f28ac98bba8d98fa303d4df72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Sat, 12 Nov 2005 17:14:17 +0000 Subject: [PATCH] O.K. Know all our tests and pisi works! Beware: import statement first looks in the containing package before looking in the standard module search path. So we shouldn't have a module named xml if we want to use the one in the system. --- pisi/component.py | 2 +- pisi/dependency.py | 2 +- pisi/files.py | 2 +- pisi/index.py | 4 ++-- pisi/metadata.py | 4 ++-- pisi/{xml => pxml}/__init__.py | 0 pisi/{xml => pxml}/autoxml.py | 4 ++-- pisi/{xml => pxml}/xmlext.py | 0 pisi/{xml => pxml}/xmlextcdom.py | 0 pisi/{xml => pxml}/xmlextmdom.py | 0 pisi/{xml => pxml}/xmlextpiks.py | 0 pisi/{xml => pxml}/xmlfile.py | 0 pisi/{xml => pxml}/xmlfilecdom.py | 0 pisi/{xml => pxml}/xmlfilemdom.py | 0 pisi/{xml => pxml}/xmlfilepiks.py | 0 pisi/specfile.py | 4 ++-- setup.py | 2 +- tests/autoxmltests.py | 4 ++-- tests/xmlexttests.py | 2 +- 19 files changed, 15 insertions(+), 15 deletions(-) rename pisi/{xml => pxml}/__init__.py (100%) rename pisi/{xml => pxml}/autoxml.py (99%) rename pisi/{xml => pxml}/xmlext.py (100%) rename pisi/{xml => pxml}/xmlextcdom.py (100%) rename pisi/{xml => pxml}/xmlextmdom.py (100%) rename pisi/{xml => pxml}/xmlextpiks.py (100%) rename pisi/{xml => pxml}/xmlfile.py (100%) rename pisi/{xml => pxml}/xmlfilecdom.py (100%) rename pisi/{xml => pxml}/xmlfilemdom.py (100%) rename pisi/{xml => pxml}/xmlfilepiks.py (100%) diff --git a/pisi/component.py b/pisi/component.py index 86191043..c558dee3 100644 --- a/pisi/component.py +++ b/pisi/component.py @@ -18,7 +18,7 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi -import pisi.xmlfile +import pisi.pxml.xmlfile as xmlfile class Error(pisi.Error): pass diff --git a/pisi/dependency.py b/pisi/dependency.py index 45b853bd..02b49c1f 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -21,7 +21,7 @@ _ = __trans.ugettext import pisi.context as ctx import pisi.packagedb as packagedb from pisi.version import Version -import pisi.xml.autoxml as autoxml +import pisi.pxml.autoxml as autoxml from pisi.util import Checks class Dependency: diff --git a/pisi/files.py b/pisi/files.py index 0e16c2d5..d4cc3104 100644 --- a/pisi/files.py +++ b/pisi/files.py @@ -15,7 +15,7 @@ # Authors: Eray Ozkural -import pisi.xml.autoxml as autoxml +import pisi.pxml.autoxml as autoxml from pisi.util import Checks import pisi.lockeddbshelve as shelve diff --git a/pisi/index.py b/pisi/index.py index 105c992c..9499ae00 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -28,8 +28,8 @@ import pisi.metadata as metadata import pisi.packagedb as packagedb import pisi.util as util from pisi.package import Package -from pisi.xml.xmlfile import XmlFile -import pisi.xml.autoxml as autoxml +from pisi.pxml.xmlfile import XmlFile +import pisi.pxml.autoxml as autoxml from pisi.uri import URI class Error(pisi.Error): diff --git a/pisi/metadata.py b/pisi/metadata.py index 9ac9fb7d..f672f5b1 100644 --- a/pisi/metadata.py +++ b/pisi/metadata.py @@ -25,8 +25,8 @@ _ = __trans.ugettext import pisi.context as ctx import pisi.specfile as specfile -import pisi.xml.xmlfile as xmlfile -import pisi.xml.autoxml as autoxml +import pisi.pxml.xmlfile as xmlfile +import pisi.pxml.autoxml as autoxml import pisi.util as util class Source: diff --git a/pisi/xml/__init__.py b/pisi/pxml/__init__.py similarity index 100% rename from pisi/xml/__init__.py rename to pisi/pxml/__init__.py diff --git a/pisi/xml/autoxml.py b/pisi/pxml/autoxml.py similarity index 99% rename from pisi/xml/autoxml.py rename to pisi/pxml/autoxml.py index 034fb5b4..1c1732e4 100644 --- a/pisi/xml/autoxml.py +++ b/pisi/pxml/autoxml.py @@ -41,8 +41,8 @@ _ = __trans.ugettext # PiSi import pisi # TODO: find the appropriate xmlext implementation and import from there -from pisi.xml.xmlext import * -from pisi.xml.xmlfile import XmlFile +from pisi.pxml.xmlext import * +from pisi.pxml.xmlfile import XmlFile import pisi.context as ctx import pisi.util as util import pisi.oo as oo diff --git a/pisi/xml/xmlext.py b/pisi/pxml/xmlext.py similarity index 100% rename from pisi/xml/xmlext.py rename to pisi/pxml/xmlext.py diff --git a/pisi/xml/xmlextcdom.py b/pisi/pxml/xmlextcdom.py similarity index 100% rename from pisi/xml/xmlextcdom.py rename to pisi/pxml/xmlextcdom.py diff --git a/pisi/xml/xmlextmdom.py b/pisi/pxml/xmlextmdom.py similarity index 100% rename from pisi/xml/xmlextmdom.py rename to pisi/pxml/xmlextmdom.py diff --git a/pisi/xml/xmlextpiks.py b/pisi/pxml/xmlextpiks.py similarity index 100% rename from pisi/xml/xmlextpiks.py rename to pisi/pxml/xmlextpiks.py diff --git a/pisi/xml/xmlfile.py b/pisi/pxml/xmlfile.py similarity index 100% rename from pisi/xml/xmlfile.py rename to pisi/pxml/xmlfile.py diff --git a/pisi/xml/xmlfilecdom.py b/pisi/pxml/xmlfilecdom.py similarity index 100% rename from pisi/xml/xmlfilecdom.py rename to pisi/pxml/xmlfilecdom.py diff --git a/pisi/xml/xmlfilemdom.py b/pisi/pxml/xmlfilemdom.py similarity index 100% rename from pisi/xml/xmlfilemdom.py rename to pisi/pxml/xmlfilemdom.py diff --git a/pisi/xml/xmlfilepiks.py b/pisi/pxml/xmlfilepiks.py similarity index 100% rename from pisi/xml/xmlfilepiks.py rename to pisi/pxml/xmlfilepiks.py diff --git a/pisi/specfile.py b/pisi/specfile.py index 27388ae9..4522f6a5 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -26,8 +26,8 @@ _ = __trans.ugettext from os.path import basename # pisi modules -from pisi.xml.xmlfile import XmlFile -import pisi.xml.autoxml as autoxml +from pisi.pxml.xmlfile import XmlFile +import pisi.pxml.autoxml as autoxml import pisi.context as ctx from pisi.dependency import Dependency import pisi.dependency diff --git a/setup.py b/setup.py index a3202428..b03e6b76 100755 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ setup(name="pisi", author_email="pisi@uludag.org.tr", url="http://www.uludag.org.tr/eng/pisi/", package_dir = {'': ''}, - packages = ['pisi', 'pisi.cli', 'pisi.actionsapi'], + packages = ['pisi', 'pisi.cli', 'pisi.actionsapi', 'pisi.pxml'], scripts = ['pisi-cli'], cmdclass = { 'install' : I18nInstall diff --git a/tests/autoxmltests.py b/tests/autoxmltests.py index cade950e..c24400f5 100644 --- a/tests/autoxmltests.py +++ b/tests/autoxmltests.py @@ -16,8 +16,8 @@ import types import pisi import pisi.api -from pisi.xml import xmlfile -from pisi.xml import autoxml +from pisi.pxml import xmlfile +from pisi.pxml import autoxml import pisi.util as util class AutoXmlTestCase(unittest.TestCase): diff --git a/tests/xmlexttests.py b/tests/xmlexttests.py index d4c25430..0d5ccb7d 100644 --- a/tests/xmlexttests.py +++ b/tests/xmlexttests.py @@ -15,7 +15,7 @@ import pisi import pisi.api import pisi.context as ctx import pisi.util as util -from pisi.xml import xmlext +from pisi.pxml import xmlext import testcase