* purl -> uri

pisi.e3p

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Project SYSTEM "Project-3.5.dtd">
+<!DOCTYPE Project SYSTEM "Project-3.7.dtd">
 <!-- Project file for project pisi -->
-<!-- Saved: 2005-08-13, 17:04:57 -->
+<!-- Saved: 2005-08-14, 19:43:08 -->
-<!-- Copyright (C) 2005 PiSi Development Team, pisi@uludag.org.tr -->
+<!-- Copyright (C) 2005 PiSi Development Team,  -->
-<Project version="3.5">
+<Project version="3.7">
+  <ProgLanguage mixed="0">Python</ProgLanguage>
+  <UIType>Qt</UIType>
   <Description>The package management software of Pardus distribution.
 </Description>
-  <VersIon>0.2</VersIon>
   <Author>PiSi Development Team</Author>
-  <EmaIl>pisi@uludag.org.tr</EmaIl>
+  <Email></Email>
   <Sources>
     <Source>
       <Dir>tools</Dir>
@@ -290,10 +291,6 @@
       <Dir>pisi</Dir>
       <Name>xmlext.py</Name>
     </Source>
-    <Source>
-      <Dir>pisi</Dir>
-      <Name>purl.py</Name>
-    </Source>
     <Source>
       <Dir>pisi</Dir>
       <Name>version.py</Name>
@@ -310,6 +307,10 @@
       <Dir>tools</Dir>
       <Name>repostats.py</Name>
     </Source>
+    <Source>
+      <Dir>pisi</Dir>
+      <Name>uri.py</Name>
+    </Source>
   </Sources>
   <Forms>
   </Forms>

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 *
 
 

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 *
 

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
 
 

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):
 

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
 

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
 

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"""

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

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):

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

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())
 

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)
     

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 "<html><head><title>%s İstatistikleri</title>" % (sys.argv[1])