aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-08-12 22:47:51 +0200
committerMichał Górny <mgorny@gentoo.org>2011-08-12 22:47:51 +0200
commitd9d341d4ff4a9c6aba639d1f7ec9f8cbc8599e7a (patch)
treecfd7d87599bff7900307cfc5830d0a9b803b7fff
parentUse relative imports within the test library. (diff)
downloadpms-test-suite-d9d341d4ff4a9c6aba639d1f7ec9f8cbc8599e7a.tar.gz
pms-test-suite-d9d341d4ff4a9c6aba639d1f7ec9f8cbc8599e7a.tar.bz2
pms-test-suite-d9d341d4ff4a9c6aba639d1f7ec9f8cbc8599e7a.zip
Use relative imports in main modules.
-rw-r--r--pmstestsuite/cli.py12
-rw-r--r--pmstestsuite/library/__init__.py2
-rw-r--r--pmstestsuite/library/depend_case.py4
-rw-r--r--pmstestsuite/library/eclass_case.py2
-rw-r--r--pmstestsuite/output/cli.py2
-rw-r--r--pmstestsuite/output/html.py2
-rw-r--r--pmstestsuite/pm/__init__.py2
-rw-r--r--pmstestsuite/pm/paludispm.py4
-rw-r--r--pmstestsuite/pm/pkgcorepm.py2
-rw-r--r--pmstestsuite/pm/portagepm.py2
10 files changed, 17 insertions, 17 deletions
diff --git a/pmstestsuite/cli.py b/pmstestsuite/cli.py
index 2b746ae..8b8abe7 100644
--- a/pmstestsuite/cli.py
+++ b/pmstestsuite/cli.py
@@ -9,12 +9,12 @@ import gobject
from optparse import OptionParser
-from pmstestsuite import PV
-from pmstestsuite.library import load_library
-from pmstestsuite.repository import NewEbuildRepository
-from pmstestsuite.repository.pms_eclass import get_common_eclass_files
-from pmstestsuite.output import get_output_modules, TestResult
-from pmstestsuite.pm import get_package_managers
+from . import PV
+from .library import load_library
+from .repository import NewEbuildRepository
+from .repository.pms_eclass import get_common_eclass_files
+from .output import get_output_modules, TestResult
+from .pm import get_package_managers
class PMSTestSuiteCLI(object):
"""
diff --git a/pmstestsuite/library/__init__.py b/pmstestsuite/library/__init__.py
index 3f7554b..349b98b 100644
--- a/pmstestsuite/library/__init__.py
+++ b/pmstestsuite/library/__init__.py
@@ -22,7 +22,7 @@
from abc import abstractproperty
from gentoopm.util import ABCObject
-from pmstestsuite.library.case import TestCase
+from .case import TestCase
class TestLibrary(ABCObject):
"""
diff --git a/pmstestsuite/library/depend_case.py b/pmstestsuite/library/depend_case.py
index 0d4f8e7..fb2881b 100644
--- a/pmstestsuite/library/depend_case.py
+++ b/pmstestsuite/library/depend_case.py
@@ -2,8 +2,8 @@
# (c) 2011 Michał Górny <mgorny@gentoo.org>
# Released under the terms of the 2-clause BSD license.
-from pmstestsuite.library.case import EbuildTestCase, AssertionResult
-from pmstestsuite.library.eclass_case import EclassTestCase
+from .case import EbuildTestCase, AssertionResult
+from .eclass_case import EclassTestCase
class DepWrappedAssertion(AssertionResult):
def __init__(self, assertion, prefix):
diff --git a/pmstestsuite/library/eclass_case.py b/pmstestsuite/library/eclass_case.py
index 582e05a..cd64a9a 100644
--- a/pmstestsuite/library/eclass_case.py
+++ b/pmstestsuite/library/eclass_case.py
@@ -4,7 +4,7 @@
from abc import abstractproperty
-from pmstestsuite.library.case import EbuildTestCase
+from .case import EbuildTestCase
class EclassTestCase(EbuildTestCase):
"""
diff --git a/pmstestsuite/output/cli.py b/pmstestsuite/output/cli.py
index 318eb8f..c11e0be 100644
--- a/pmstestsuite/output/cli.py
+++ b/pmstestsuite/output/cli.py
@@ -2,7 +2,7 @@
# (c) 2011 Michał Górny <mgorny@gentoo.org>
# Released under the terms of the 2-clause BSD license.
-from pmstestsuite.output import OutputModule
+from . import OutputModule
class CLIOutput(OutputModule):
name = 'cli'
diff --git a/pmstestsuite/output/html.py b/pmstestsuite/output/html.py
index d5e0676..1e497b1 100644
--- a/pmstestsuite/output/html.py
+++ b/pmstestsuite/output/html.py
@@ -6,7 +6,7 @@ from collections import defaultdict
from gentoopm.util import ABCObject
from abc import abstractmethod
-from pmstestsuite.output import OutputModule
+from . import OutputModule
class HTMLOutput(OutputModule):
name = 'html'
diff --git a/pmstestsuite/pm/__init__.py b/pmstestsuite/pm/__init__.py
index 4667fab..933e025 100644
--- a/pmstestsuite/pm/__init__.py
+++ b/pmstestsuite/pm/__init__.py
@@ -14,7 +14,7 @@ from abc import abstractmethod, abstractproperty
from gentoopm.util import ABCObject
import gobject
-from pmstestsuite.repository import EbuildRepository
+from ..repository import EbuildRepository
class PackageManagerOps:
merge = 0
diff --git a/pmstestsuite/pm/paludispm.py b/pmstestsuite/pm/paludispm.py
index bb65a13..3fbcfee 100644
--- a/pmstestsuite/pm/paludispm.py
+++ b/pmstestsuite/pm/paludispm.py
@@ -11,12 +11,12 @@
import os, os.path, subprocess
from gentoopm.paludispm import PaludisPM as _PaludisPM
-from pmstestsuite.pm import PackageManager
+from . import PackageManager
class PaludisPM(_PaludisPM, PackageManager):
"""
A class implementing the interfaces to the Paludis PM.
-
+
Requires Paludis with USE=python.
"""
name = 'paludis'
diff --git a/pmstestsuite/pm/pkgcorepm.py b/pmstestsuite/pm/pkgcorepm.py
index f543ec9..b1b5581 100644
--- a/pmstestsuite/pm/pkgcorepm.py
+++ b/pmstestsuite/pm/pkgcorepm.py
@@ -11,7 +11,7 @@
import subprocess
from gentoopm.pkgcorepm import PkgCorePM as _PkgCorePM
-from pmstestsuite.pm import PackageManager
+from . import PackageManager
class PkgCorePM(_PkgCorePM, PackageManager):
"""
diff --git a/pmstestsuite/pm/portagepm.py b/pmstestsuite/pm/portagepm.py
index 1c00749..9ee7657 100644
--- a/pmstestsuite/pm/portagepm.py
+++ b/pmstestsuite/pm/portagepm.py
@@ -11,7 +11,7 @@
import copy, os, subprocess
from gentoopm.portagepm import PortagePM as _PortagePM
-from pmstestsuite.pm import PackageManager
+from . import PackageManager
class PortagePM(_PortagePM, PackageManager):
""" A class implementing the interfaces to the Portage PM. """