diff --git a/pisi.e3p b/pisi.e3p index f9bbb0d7..f7daafb1 100644 --- a/pisi.e3p +++ b/pisi.e3p @@ -1,14 +1,15 @@ - + - - - + + + + Python + Qt The package management software of Pardus distribution. - 0.2 PiSi Development Team - pisi@uludag.org.tr + tools @@ -290,10 +291,6 @@ pisi xmlext.py - - pisi - purl.py - pisi version.py @@ -310,6 +307,10 @@ tools repostats.py + + pisi + uri.py + diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index b94fe5e2..5c2f224b 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -14,7 +14,7 @@ import sys from optparse import OptionParser import pisi -from pisi.purl import URI +from pisi.uri import URI from pisi.cli.common import * diff --git a/pisi/cli/pisicli.py b/pisi/cli/pisicli.py index 56f2453f..5f731649 100644 --- a/pisi/cli/pisicli.py +++ b/pisi/cli/pisicli.py @@ -14,7 +14,7 @@ import sys from optparse import OptionParser import pisi -from pisi.purl import URI +from pisi.uri import URI from pisi.cli.common import * from pisi.cli.commands import * diff --git a/pisi/fetcher.py b/pisi/fetcher.py index 4d551b6e..39ae98f7 100644 --- a/pisi/fetcher.py +++ b/pisi/fetcher.py @@ -23,7 +23,7 @@ from base64 import encodestring # pisi modules import pisi import pisi.util as util -from pisi.purl import URI +from pisi.uri import URI from pisi.ui import ui diff --git a/pisi/index.py b/pisi/index.py index df6d2835..a0f10238 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -24,7 +24,7 @@ from pisi.ui import ui import pisi.util as util from pisi.config import config from pisi.constants import const -from pisi.purl import URI +from pisi.uri import URI class Index(XmlFile): diff --git a/pisi/operations.py b/pisi/operations.py index b1236fd6..a6e1e6c3 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -16,7 +16,7 @@ import pisi from pisi.config import config from pisi.constants import const from pisi.ui import ui -from pisi.purl import URI +from pisi.uri import URI import pisi.util as util import pisi.packagedb as packagedb diff --git a/pisi/package.py b/pisi/package.py index 90eb7638..6d5f7ba8 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -21,7 +21,7 @@ import pisi import pisi.archive as archive from pisi.constants import const from pisi.config import config -from pisi.purl import URI +from pisi.uri import URI from pisi.metadata import MetaData from pisi.files import Files diff --git a/pisi/repodb.py b/pisi/repodb.py index 7ddeb5a7..b495b87f 100644 --- a/pisi/repodb.py +++ b/pisi/repodb.py @@ -17,7 +17,7 @@ import os, fcntl from pisi.config import config import pisi.packagedb as packagedb import pisi.util as util -from pisi.purl import URI +from pisi.uri import URI class RepoDB(object): """RepoDB maps repo ids to repository information""" diff --git a/pisi/sourcearchive.py b/pisi/sourcearchive.py index f2963b4d..ccb94a76 100644 --- a/pisi/sourcearchive.py +++ b/pisi/sourcearchive.py @@ -22,7 +22,7 @@ from os import access, R_OK # pisi modules import pisi from pisi.archive import Archive -from pisi.purl import URI +from pisi.uri import URI from pisi.ui import ui from pisi.config import config from pisi.fetcher import fetchUrl diff --git a/pisi/sourcefetcher.py b/pisi/sourcefetcher.py index ac68d8f0..1d92c1b5 100644 --- a/pisi/sourcefetcher.py +++ b/pisi/sourcefetcher.py @@ -15,7 +15,7 @@ from os.path import basename, dirname, join from pisi.ui import ui from pisi.config import config from pisi.constants import const -from pisi.purl import URI +from pisi.uri import URI from pisi.specfile import SpecFile class SourceFetcher(object): diff --git a/pisi/toplevel.py b/pisi/toplevel.py index 73ea320d..2806d3d8 100644 --- a/pisi/toplevel.py +++ b/pisi/toplevel.py @@ -20,7 +20,7 @@ if ver[0] <= 2 and ver[1] < 4: from pisi.config import config from pisi.constants import const from pisi.ui import ui -from pisi.purl import URI +from pisi.uri import URI import pisi.util as util import pisi.dependency as dependency import pisi.pgraph as pgraph diff --git a/pisi/purl.py b/pisi/uri.py similarity index 100% rename from pisi/purl.py rename to pisi/uri.py diff --git a/tests/archivetests.py b/tests/archivetests.py index 56a745e3..d0b87697 100644 --- a/tests/archivetests.py +++ b/tests/archivetests.py @@ -19,7 +19,7 @@ from pisi import fetcher from pisi import util from pisi import context from pisi.config import config -from pisi import purl +from pisi import uri class ArchiveFileTestCase(unittest.TestCase): # def setUp(self): @@ -93,7 +93,7 @@ class ArchiveFileTestCase(unittest.TestCase): def testUnpackZipCond(self): ctx = context.BuildContext("tests/sandbox/pspec.xml") - url = purl.PUrl(ctx.spec.source.archiveUri) + url = uri.URI(ctx.spec.source.archiveUri) targetDir = ctx.pkg_work_dir() filePath = join(config.archives_dir(), url.filename()) diff --git a/tests/fetchertests.py b/tests/fetchertests.py index aa448046..561016d0 100644 --- a/tests/fetchertests.py +++ b/tests/fetchertests.py @@ -15,12 +15,12 @@ from pisi import fetcher from pisi import util from pisi import context from pisi import config -from pisi import purl +from pisi import uri class FetcherTestCase(unittest.TestCase): def setUp(self): self.ctx = context.BuildContext("tests/popt/pspec.xml") - self.url = purl.PUrl(self.ctx.spec.source.archiveUri) + self.url = uri.URI(self.ctx.spec.source.archiveUri) self.destpath = config.config.archives_dir() self.fetch = fetcher.Fetcher(self.url, self.destpath) diff --git a/tools/repostats.py b/tools/repostats.py index a5867977..cc8f6e54 100755 --- a/tools/repostats.py +++ b/tools/repostats.py @@ -14,7 +14,7 @@ import os sys.path.append('.') import pisi.specfile -import pisi.purl +import pisi.uri class Histogram: def __init__(self): @@ -119,7 +119,7 @@ for pak in paks: people.add(name) for lice in lices: licenses.add(lice) - host = pisi.purl.PUrl(spec.source.archiveUri).location() + host = pisi.uri.URI(spec.source.archiveUri).location() hosts.add(host) print "%s İstatistikleri" % (sys.argv[1])