Improved loader and example

excid3 · Aug 1, 2010 · 53e7345 · 53e7345
1 parent 3a3f101
commit 53e7345
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/src/example.py → example.py b/src/example.py → example.py
@@ -18,17 +18,10 @@
 import logging
 import os
 
-from DefinitionManager import DefinitionManager
+from unwrapt import loader
 
 logging.basicConfig(level=logging.DEBUG)
 
-# Make sure this works being launched from any location
-__path__ = os.path.dirname(os.path.abspath(__file__))
-folder = "%s/definitions" % __path__
-
-# Load definitions from folder
-loader = DefinitionManager(folder)
-
 # Instanciate an apt client
 apt = loader.load("apt")
 

diff --git a/src/DefinitionBase.py → unwrapt/DefinitionBase.py b/src/DefinitionBase.py → unwrapt/DefinitionBase.py
diff --git a/src/DefinitionManager.py → unwrapt/DefinitionManager.py b/src/DefinitionManager.py → unwrapt/DefinitionManager.py
diff --git a/src/Download.py → unwrapt/Download.py b/src/Download.py → unwrapt/Download.py
diff --git a/src/__init__.py → unwrapt/__init__.py b/src/__init__.py → unwrapt/__init__.py
@@ -14,4 +14,13 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
+
 from DefinitionManager import DefinitionManager
+
+# Make sure this works being launched from any location
+__path__ = os.path.dirname(os.path.abspath(__file__))
+folder = "%s/definitions" % __path__
+
+# Load definitions from folder
+loader = DefinitionManager(folder)
diff --git a/src/definitions/aptdef/DpkgVersion.py → unwrapt/definitions/aptdef/DpkgVersion.py b/src/definitions/aptdef/DpkgVersion.py → unwrapt/definitions/aptdef/DpkgVersion.py
diff --git a/src/definitions/aptdef/__init__.py → unwrapt/definitions/aptdef/__init__.py b/src/definitions/aptdef/__init__.py → unwrapt/definitions/aptdef/__init__.py
diff --git a/src/utils.py → unwrapt/utils.py b/src/utils.py → unwrapt/utils.py