[Pkg-bazaar-commits] ./bzr-builddeb/trunk r214: Don't use relative imports.
James Westby
jw+debian at jameswestby.net
Thu May 15 13:29:38 UTC 2008
------------------------------------------------------------
revno: 214
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Thu 2008-03-06 00:04:59 +0000
message:
Don't use relative imports.
modified:
__init__.py
builder.py
changes.py
config.py
debian/changelog
debian/rules
hooks.py
import_dsc.py
merge_upstream.py
tests/__init__.py
tests/blackbox/test_builddeb.py
tests/blackbox/test_import_dsc.py
tests/blackbox/test_merge_upstream.py
tests/test_builder.py
tests/test_config.py
tests/test_hooks.py
tests/test_import_dsc.py
tests/test_merge_upstream.py
tests/test_repack_tarball.py
tests/test_util.py
tests/test_version.py
util.py
------------------------------------------------------------
revno: 212.1.1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: imports
timestamp: Wed 2008-03-05 17:00:51 +0000
message:
* Don't use relative imports. (LP: #189429)
modified:
__init__.py
builder.py
changes.py
config.py
debian/changelog
debian/rules
hooks.py
import_dsc.py
merge_upstream.py
tests/__init__.py
tests/blackbox/test_builddeb.py
tests/blackbox/test_import_dsc.py
tests/blackbox/test_merge_upstream.py
tests/test_builder.py
tests/test_config.py
tests/test_hooks.py
tests/test_import_dsc.py
tests/test_merge_upstream.py
tests/test_repack_tarball.py
tests/test_util.py
tests/test_version.py
util.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py 2008-03-05 17:23:00 +0000
+++ b/__init__.py 2008-03-06 00:04:59 +0000
@@ -37,20 +37,20 @@
from bzrlib import urlutils
from bzrlib.workingtree import WorkingTree
-from builder import (DebBuild,
+from bzrlib.plugins.builddeb.builder import (DebBuild,
DebMergeBuild,
DebNativeBuild,
DebSplitBuild,
DebMergeExportUpstreamBuild,
DebExportUpstreamBuild,
)
-from config import DebBuildConfig
-from errors import (StopBuild,
+from bzrlib.plugins.builddeb.config import DebBuildConfig
+from bzrlib.plugins.builddeb.errors import (StopBuild,
)
-from hooks import run_hook
-from properties import BuildProperties
-from util import goto_branch, find_changelog, tarball_name
-from version import version_info
+from bzrlib.plugins.builddeb.hooks import run_hook
+from bzrlib.plugins.builddeb.properties import BuildProperties
+from bzrlib.plugins.builddeb.util import goto_branch, find_changelog, tarball_name
+from bzrlib.plugins.builddeb.version import version_info
dont_purge_opt = Option('dont-purge',
@@ -330,9 +330,9 @@
from bzrlib.errors import (NoSuchTag,
TagAlreadyExists,
)
- from errors import MissingChangelogError
- from merge_upstream import merge_upstream
- from repack_tarball import repack_tarball
+ from bzrlib.plugins.builddeb.errors import MissingChangelogError
+ from bzrlib.plugins.builddeb.merge_upstream import merge_upstream
+ from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
if version is None:
raise BzrCommandError("You must supply the --version argument.")
@@ -447,7 +447,7 @@
def run(self, files_list, to=None, snapshot=None, filename=None,
initial=False):
- from import_dsc import DscImporter, SnapshotImporter
+ from bzrlib.plugins.builddeb.import_dsc import DscImporter, SnapshotImporter
if files_list is None:
files_list = []
if filename is not None:
@@ -602,7 +602,7 @@
def test_suite():
from unittest import TestSuite
- import tests
+ from bzrlib.plugins.builddeb import tests
result = TestSuite()
result.addTest(tests.test_suite())
return result
=== modified file 'builder.py'
--- a/builder.py 2007-10-30 14:34:51 +0000
+++ b/builder.py 2008-03-05 17:00:51 +0000
@@ -36,13 +36,13 @@
from bzrlib.trace import info, mutter
from bzrlib.workingtree import WorkingTree
-from changes import DebianChanges
-from errors import (DebianError,
+from bzrlib.plugins.builddeb.changes import DebianChanges
+from bzrlib.plugins.builddeb.errors import (DebianError,
NoSourceDirError,
BuildFailedError,
StopBuild,
)
-from util import recursive_copy, tarball_name
+from bzrlib.plugins.builddeb.util import recursive_copy, tarball_name
def remove_dir(base, dir):
"""Removes a directory from within a base."""
=== modified file 'changes.py'
--- a/changes.py 2007-10-29 18:00:52 +0000
+++ b/changes.py 2008-03-05 17:00:51 +0000
@@ -25,7 +25,7 @@
from bzrlib.trace import mutter
-from errors import DebianError
+from bzrlib.plugins.builddeb.errors import DebianError
class DebianChanges(deb822.Changes):
"""Abstraction of the .changes file. Use it to find out what files were
=== modified file 'config.py'
--- a/config.py 2007-12-03 01:25:00 +0000
+++ b/config.py 2008-03-05 17:00:51 +0000
@@ -20,7 +20,7 @@
from bzrlib.config import ConfigObj, TreeConfig
from bzrlib.trace import mutter
-from util import get_snapshot_revision
+from bzrlib.plugins.builddeb.util import get_snapshot_revision
class DebBuildConfig(object):
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-01-25 18:15:53 +0000
+++ b/debian/changelog 2008-03-05 17:00:51 +0000
@@ -1,4 +1,4 @@
-bzr-builddeb (0.93) gutsy; urgency=low
+bzr-builddeb (0.93) unstable; urgency=low
[ Arnaud Fontaine ]
* Add Vcs-Bzr field (dpkg supports it now) in debian/control.
@@ -21,8 +21,9 @@
gets the data, and is representable in bzr.
* Don't silently skip unkown types when extracting a tarball, error
instead.
+ * Don't use relative imports. (LP: #189429)
- -- James Westby <jw+debian at jameswestby.net> Fri, 25 Jan 2008 18:14:55 +0000
+ -- James Westby <jw+debian at jameswestby.net> Wed, 05 Mar 2008 16:58:12 +0000
bzr-builddeb (0.92) unstable; urgency=low
=== modified file 'debian/rules'
--- a/debian/rules 2007-07-10 21:21:19 +0000
+++ b/debian/rules 2008-03-05 17:00:51 +0000
@@ -23,7 +23,8 @@
python$* setup.py build
ifeq (,$(findstring nocheck,$(DEBBUILDOPTS)))
ifeq (,$(findstring notest,$(DEBBUILDOPTS)))
- python$* __init__.py
+ [ -e builddeb ] || ln -s . builddeb
+ BZR_PLUGIN_PATH="$(CURDIR)" python$* /usr/bin/bzr selftest builddeb
endif
endif
touch $@
@@ -34,6 +35,7 @@
rm -f build-stamp install-all-stamp
rm -f $(html_docs)
rm -f README.html
+ rm -f builddeb
python setup.py clean --all
dh_clean
=== modified file 'hooks.py'
--- a/hooks.py 2007-10-29 18:00:52 +0000
+++ b/hooks.py 2008-03-05 17:00:51 +0000
@@ -22,7 +22,7 @@
from bzrlib.trace import info
-from errors import HookFailedError
+from bzrlib.plugins.builddeb.errors import HookFailedError
def run_hook(hook_name, config, wd=None):
=== modified file 'import_dsc.py'
--- a/import_dsc.py 2008-01-26 10:11:55 +0000
+++ b/import_dsc.py 2008-03-05 17:00:51 +0000
@@ -53,8 +53,13 @@
add_implied_parents,
)
-from errors import ImportError, OnlyImportSingleDsc, UnknownType
-from merge_upstream import make_upstream_tag, upstream_tag_to_version
+from bzrlib.plugins.builddeb.errors import (ImportError,
+ OnlyImportSingleDsc,
+ UnknownType,
+ )
+from bzrlib.plugins.builddeb.merge_upstream import (make_upstream_tag,
+ upstream_tag_to_version,
+ )
# TODO: support explicit upstream branch.
=== modified file 'merge_upstream.py'
--- a/merge_upstream.py 2007-10-31 19:58:28 +0000
+++ b/merge_upstream.py 2008-03-05 17:00:51 +0000
@@ -41,7 +41,7 @@
import_zip,
)
-from errors import AddChangelogError
+from bzrlib.plugins.builddeb.errors import AddChangelogError
# TODO: way of working out new version number.
# TODO: support using an explicit standalone upstream branch.
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2007-10-29 18:00:52 +0000
+++ b/tests/__init__.py 2008-03-05 17:00:51 +0000
@@ -31,7 +31,7 @@
from bzrlib.tests import TestUtil, adapt_modules, TestCaseWithTransport
-import blackbox
+from bzrlib.plugins.builddeb.tests import blackbox
def make_new_upstream_dir(dir):
=== modified file 'tests/blackbox/test_builddeb.py'
--- a/tests/blackbox/test_builddeb.py 2007-10-29 18:00:52 +0000
+++ b/tests/blackbox/test_builddeb.py 2008-03-05 17:00:51 +0000
@@ -24,7 +24,7 @@
Version,
)
-from tests import BuilddebTestCase
+from bzrlib.plugins.builddeb.tests import BuilddebTestCase
class TestBuilddeb(BuilddebTestCase):
=== modified file 'tests/blackbox/test_import_dsc.py'
--- a/tests/blackbox/test_import_dsc.py 2007-10-29 22:04:19 +0000
+++ b/tests/blackbox/test_import_dsc.py 2008-03-05 17:00:51 +0000
@@ -26,7 +26,7 @@
from bzrlib.bzrdir import BzrDir
from bzrlib.workingtree import WorkingTree
-from tests import BuilddebTestCase
+from bzrlib.plugins.builddeb.tests import BuilddebTestCase
class TestImportDsc(BuilddebTestCase):
=== modified file 'tests/blackbox/test_merge_upstream.py'
--- a/tests/blackbox/test_merge_upstream.py 2007-10-29 18:00:52 +0000
+++ b/tests/blackbox/test_merge_upstream.py 2008-03-05 17:00:51 +0000
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-from tests import BuilddebTestCase
+from bzrlib.plugins.builddeb.tests import BuilddebTestCase
class TestMergeUpstream(BuilddebTestCase):
=== modified file 'tests/test_builder.py'
--- a/tests/test_builder.py 2008-01-24 13:09:43 +0000
+++ b/tests/test_builder.py 2008-03-05 17:00:51 +0000
@@ -31,7 +31,7 @@
)
from bzrlib.workingtree import WorkingTree
-from builder import (remove_dir,
+from bzrlib.plugins.builddeb.builder import (remove_dir,
remove_bzrbuilddeb_dir,
remove_debian_dir,
DebBuild,
@@ -42,9 +42,9 @@
DebExportUpstreamBuild,
UpstreamExporter,
)
-import errors
-from properties import BuildProperties
-from tests import BuilddebTestCase
+from bzrlib.plugins.builddeb import errors
+from bzrlib.plugins.builddeb.properties import BuildProperties
+from bzrlib.plugins.builddeb.tests import BuilddebTestCase
class TestUtil(TestCaseInTempDir):
"""Test the utility functions from builder.py."""
=== modified file 'tests/test_config.py'
--- a/tests/test_config.py 2007-12-03 01:25:00 +0000
+++ b/tests/test_config.py 2008-03-05 17:00:51 +0000
@@ -22,7 +22,7 @@
from bzrlib.tests import TestCaseWithTransport
-from config import DebBuildConfig
+from bzrlib.plugins.builddeb.config import DebBuildConfig
class DebBuildConfigTests(TestCaseWithTransport):
=== modified file 'tests/test_hooks.py'
--- a/tests/test_hooks.py 2007-10-29 18:00:52 +0000
+++ b/tests/test_hooks.py 2008-03-05 17:00:51 +0000
@@ -22,9 +22,9 @@
from bzrlib.tests import TestCaseInTempDir
-from config import DebBuildConfig
-from errors import HookFailedError
-from hooks import run_hook
+from bzrlib.plugins.builddeb.config import DebBuildConfig
+from bzrlib.plugins.builddeb.errors import HookFailedError
+from bzrlib.plugins.builddeb.hooks import run_hook
class HookTests(TestCaseInTempDir):
=== modified file 'tests/test_import_dsc.py'
--- a/tests/test_import_dsc.py 2008-01-25 18:04:31 +0000
+++ b/tests/test_import_dsc.py 2008-03-05 17:00:51 +0000
@@ -29,8 +29,8 @@
from bzrlib.tests import TestCaseWithTransport
from bzrlib.workingtree import WorkingTree
-from errors import ImportError, OnlyImportSingleDsc
-from import_dsc import DscImporter, files_to_ignore
+from bzrlib.plugins.builddeb.errors import ImportError, OnlyImportSingleDsc
+from bzrlib.plugins.builddeb.import_dsc import DscImporter, files_to_ignore
def write_to_file(filename, contents):
f = open(filename, 'wb')
=== modified file 'tests/test_merge_upstream.py'
--- a/tests/test_merge_upstream.py 2007-10-31 19:58:28 +0000
+++ b/tests/test_merge_upstream.py 2008-03-05 17:00:51 +0000
@@ -30,7 +30,7 @@
from bzrlib.tests import TestCaseWithTransport
from bzrlib.workingtree import WorkingTree
-from merge_upstream import merge_upstream
+from bzrlib.plugins.builddeb.merge_upstream import merge_upstream
def write_to_file(filename, contents):
=== modified file 'tests/test_repack_tarball.py'
--- a/tests/test_repack_tarball.py 2007-10-31 21:07:48 +0000
+++ b/tests/test_repack_tarball.py 2008-03-05 17:00:51 +0000
@@ -28,7 +28,7 @@
)
from bzrlib.tests import TestCaseInTempDir
-from repack_tarball import repack_tarball
+from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
def touch(filename):
=== modified file 'tests/test_util.py'
--- a/tests/test_util.py 2008-01-24 13:33:42 +0000
+++ b/tests/test_util.py 2008-03-05 17:00:51 +0000
@@ -20,8 +20,10 @@
import os
-from errors import MissingChangelogError, AddChangelogError
-from util import (
+from bzrlib.plugins.builddeb.errors import (MissingChangelogError,
+ AddChangelogError,
+ )
+from bzrlib.plugins.builddeb.util import (
find_changelog,
recursive_copy,
get_snapshot_revision,
=== modified file 'tests/test_version.py'
--- a/tests/test_version.py 2007-10-29 18:00:52 +0000
+++ b/tests/test_version.py 2008-03-05 17:00:51 +0000
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-import version
+from bzrlib.plugins.builddeb import version
import bzrlib
from bzrlib.tests import TestCase, KnownFailure
=== modified file 'util.py'
--- a/util.py 2008-01-24 13:33:42 +0000
+++ b/util.py 2008-03-05 17:00:51 +0000
@@ -26,7 +26,9 @@
from debian_bundle.changelog import Changelog
-from errors import MissingChangelogError, AddChangelogError
+from bzrlib.plugins.builddeb.errors import (MissingChangelogError,
+ AddChangelogError,
+ )
def recursive_copy(fromdir, todir):
More information about the Pkg-bazaar-commits
mailing list