pisi.struct -> pisi.data

$ greptile -l -r -i -g pisi.data pisi.struct pisi

pisi/api.py

@@ -29,23 +29,23 @@
 import pisi.context as ctx
 from pisi.uri import URI
 import pisi.util as util
-import pisi.struct as struct
-import pisi.struct.dependency as dependency
+import pisi.data as struct
+import pisi.data.dependency as dependency
 import pisi.pgraph as pgraph
 import pisi.operations as operations
 import pisi.db as db
 #.package as packagedb
 #import pisi.db.repo as repodb
 #import pisi.db.install as installdb
 #import pisi.db.source as sourcedb
-import pisi.struct.component as component
-from pisi.struct.index import Index
+import pisi.data.component as component
+from pisi.data.index import Index
 import pisi.cli
 from pisi.operations import install, remove, upgrade, emerge
 from pisi.build import build_until
 from pisi.atomicoperations import resurrect_package, build
-from pisi.struct.metadata import MetaData
-from pisi.struct.files import Files
+from pisi.data.metadata import MetaData
+from pisi.data.files import Files
 from pisi.file import File
 import pisi.search
 import pisi.db.lockeddbshelve as shelve

pisi/atomicoperations.py

@@ -24,11 +24,11 @@
 import pisi
 import pisi.context as ctx
 import pisi.db.package as packagedb
-import pisi.struct.dependency as dependency
+import pisi.data.dependency as dependency
 import pisi.util as util
-from pisi.struct.specfile import *
-from pisi.struct.metadata import MetaData
-from pisi.struct.files import Files
+from pisi.data.specfile import *
+from pisi.data.metadata import MetaData
+from pisi.data.files import Files
 from pisi.uri import URI
 import pisi.ui
 from pisi.version import Version

pisi/build.py

@@ -27,19 +27,19 @@
 _ = __trans.ugettext
 
 import pisi
-from pisi.struct.specfile import SpecFile
+from pisi.data.specfile import SpecFile
 import pisi.util as util
 from pisi.util import join_path as join, parenturi
 from pisi.file import File
 import pisi.context as ctx
-import pisi.struct.dependency as dependency
+import pisi.data.dependency as dependency
 import pisi.operations as operations
 from pisi.sourcearchive import SourceArchive
-from pisi.struct.files import Files, FileInfo
+from pisi.data.files import Files, FileInfo
 from pisi.fetcher import fetch_url
 from pisi.uri import URI
-from pisi.struct.metadata import MetaData
-import pisi.struct.component as component
+from pisi.data.metadata import MetaData
+import pisi.data.component as component
 from pisi.package import Package
 import pisi.archive as archive
 import pisi.actionsapi.variables

pisi/struct/specfile.py → pisi/data/specfile.py

@@ -200,7 +200,7 @@ def pkg_dir(self):
     def installable(self):
         """calculate if pkg is installable currently"""
         deps = self.runtimeDependencies()
-        return pisi.struct.dependency.satisfies_dependencies(self.name, deps)
+        return pisi.data.dependency.satisfies_dependencies(self.name, deps)
 
     def __str__(self):
         if self.build:

pisi/db/install.py

@@ -26,7 +26,7 @@
 import pisi
 import pisi.context as ctx
 import lockeddbshelve as shelve
-from pisi.struct.files import Files
+from pisi.data.files import Files
 import pisi.util as util
 from pisi.util import join_path as join
 

pisi/operations.py

@@ -24,12 +24,12 @@
 import pisi.context as ctx
 from pisi.uri import URI
 import pisi.util as util
-import pisi.struct.dependency as dependency
+import pisi.data.dependency as dependency
 import pisi.pgraph as pgraph
 import pisi.db.package as packagedb
 import pisi.db.repo as repodb
 import pisi.db.install as installdb
-from pisi.struct.index import Index
+from pisi.data.index import Index
 import pisi.cli
 import pisi.atomicoperations as atomicoperations
 import pisi.ui as ui

pisi/package.py

@@ -24,8 +24,8 @@
 import pisi.context as ctx
 import pisi.archive as archive
 from pisi.uri import URI
-from pisi.struct.metadata import MetaData
-from pisi.struct.files import Files
+from pisi.data.metadata import MetaData
+from pisi.data.files import Files
 import pisi.util as util
 
 class Error(pisi.Error):