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.
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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:
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
|
||||
# Authors: Eray Ozkural <eray@uludag.org.tr>
|
||||
|
||||
import pisi.xml.autoxml as autoxml
|
||||
import pisi.pxml.autoxml as autoxml
|
||||
from pisi.util import Checks
|
||||
import pisi.lockeddbshelve as shelve
|
||||
|
||||
|
||||
+2
-2
@@ -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):
|
||||
|
||||
+2
-2
@@ -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:
|
||||
|
||||
@@ -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
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user