[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 369: Use absolute imports for hardwarepack_format and FetchImage.

Message ID 20110701145821.18032.75931.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Mattias Backman July 1, 2011, 2:58 p.m.
Merge authors:
  Mattias Backman (mabac)
Related merge proposals:
  https://code.launchpad.net/~mabac/linaro-image-tools/use-absolute-imports/+merge/66167
  proposed by: Mattias Backman (mabac)
------------------------------------------------------------
revno: 369 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: trunk
timestamp: Fri 2011-07-01 11:21:11 +0200
message:
  Use absolute imports for hardwarepack_format and FetchImage.
modified:
  linaro_image_tools/hwpack/config.py
  linaro_image_tools/index_server.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription

Patch

=== modified file 'linaro_image_tools/hwpack/config.py'
--- linaro_image_tools/hwpack/config.py	2011-06-20 13:46:16 +0000
+++ linaro_image_tools/hwpack/config.py	2011-06-28 15:16:43 +0000
@@ -22,7 +22,7 @@ 
 import ConfigParser
 import re
 
-from hardwarepack_format import (
+from linaro_image_tools.hwpack.hardwarepack_format import (
     HardwarePackFormatV1,
     HardwarePackFormatV2,
     )

=== modified file 'linaro_image_tools/index_server.py'
--- linaro_image_tools/index_server.py	2011-06-17 18:04:47 +0000
+++ linaro_image_tools/index_server.py	2011-06-29 06:29:34 +0000
@@ -22,10 +22,10 @@ 
 
 import os
 import re
-import FetchImage
 import urlparse
 import logging
 import bz2
+import linaro_image_tools.FetchImage
 
 RELEASES_WWW_DOCUMENT_ROOT  = "/srv/releases.linaro.org/www/platform/"
 RELEASE_URL                 = "http://releases.linaro.org/platform/"
@@ -41,7 +41,7 @@ 
     def __init__(self):
         self.reset()
         self.db_file_name = "server_index"
-        self.db = FetchImage.DB(self.db_file_name)
+        self.db = linaro_image_tools.FetchImage.DB(self.db_file_name)
 
     def crawl(self):
         self.db.set_url_parse_info(self.url_parse)