Use relative imports for submodules.

Needed for Python 3.x.

setools/__init__.py

@@ -24,30 +24,30 @@ except:
     __version__ = "unknown"
 
 # Python classes for policy representation
-import policyrep
-from policyrep import SELinuxPolicy
+from . import policyrep
+from .policyrep import SELinuxPolicy
 
 # Component Queries
-import commonquery
-import objclassquery
-import typequery
-import rolequery
-import userquery
-import boolquery
-import polcapquery
-import permissivequery
+from . import commonquery
+from . import objclassquery
+from . import typequery
+from . import rolequery
+from . import userquery
+from . import boolquery
+from . import polcapquery
+from . import permissivequery
 
 # Rule Queries
-import terulequery
-import rbacrulequery
-import mlsrulequery
+from . import terulequery
+from . import rbacrulequery
+from . import mlsrulequery
 
 # In-policy Context Queries
-import initsidquery
+from . import initsidquery
 
 # Information Flow Analysis
-import infoflow
-import permmap
+from . import infoflow
+from . import permmap
 
 # Domain Transition Analysis
-import dta
+from . import dta

setools/boolquery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import compquery
+from . import compquery
 
 
 class BoolQuery(compquery.ComponentQuery):

setools/commonquery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import compquery
+from . import compquery
 
 
 class CommonQuery(compquery.ComponentQuery):

setools/compquery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import query
+from . import query
 
 
 class ComponentQuery(query.PolicyQuery):

setools/contextquery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import query
+from . import query
 
 
 class ContextQuery(query.PolicyQuery):

setools/infoflow.py

@@ -18,10 +18,11 @@
 #
 import itertools
 
-import policyrep
-import permmap
 import networkx as nx
 
+from . import policyrep
+from . import permmap
+
 
 class InfoFlowAnalysis(object):
 

setools/initsidquery.py

@@ -16,8 +16,8 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import compquery
-import contextquery
+from . import compquery
+from . import contextquery
 
 
 class InitialSIDQuery(compquery.ComponentQuery, contextquery.ContextQuery):

setools/mlsrulequery.py

@@ -16,7 +16,7 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import rulequery
+from . import rulequery
 
 
 class MLSRuleQuery(rulequery.RuleQuery):

setools/objclassquery.py

@@ -18,8 +18,8 @@
 #
 import re
 
-import compquery
-from policyrep.objclass import NoCommon
+from . import compquery
+from .policyrep.objclass import NoCommon
 
 
 class ObjClassQuery(compquery.ComponentQuery):

setools/permissivequery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import compquery
+from . import compquery
 
 
 class PermissiveQuery(compquery.ComponentQuery):

setools/permmap.py

@@ -18,7 +18,8 @@
 #
 
 from sepolgen import objectmodel as om
-import policyrep
+
+from . import policyrep
 
 # build off of sepolgen perm map implementation
 

setools/polcapquery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import compquery
+from . import compquery
 
 
 class PolCapQuery(compquery.ComponentQuery):

setools/policyrep/__init__.py

@@ -21,7 +21,7 @@
 # abstractions and methods for accessing the policy
 # structures.
 
-import qpol
+from . import qpol
 
 # The libqpol SWIG class is not quite natural for
 # Python, since void* are passed around from the
@@ -35,26 +35,26 @@ import qpol
 # be valid for the policy it comes from.
 
 # Components
-import objclass
-import typeattr
-import boolcond
-import role
-import user
-import mls
-import polcap
+from . import objclass
+from . import typeattr
+from . import boolcond
+from . import role
+from . import user
+from . import mls
+from . import polcap
 
 # Rules
-import terule
-import rbacrule
-import mlsrule
+from . import terule
+from . import rbacrule
+from . import mlsrule
 
 # Constraints
-import constraint
+from . import constraint
 
 # In-policy Labeling
-import initsid
-import fscontext
-import netcontext
+from . import initsid
+from . import fscontext
+from . import netcontext
 
 
 class SELinuxPolicy(object):

setools/policyrep/boolcond.py

@@ -16,9 +16,10 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
 import string
-import symbol
+
+from . import qpol
+from . import symbol
 
 
 class Boolean(symbol.PolicySymbol):

setools/policyrep/constraint.py

@@ -18,9 +18,9 @@
 #
 import string
 
-import qpol
-import symbol
-import objclass
+from . import qpol
+from . import symbol
+from . import objclass
 
 
 class Constraint(symbol.PolicySymbol):

setools/policyrep/context.py

@@ -16,12 +16,12 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
-import symbol
-import user
-import role
-import typeattr
-import mls
+from . import qpol
+from . import symbol
+from . import user
+from . import role
+from . import typeattr
+from . import mls
 
 
 class Context(symbol.PolicySymbol):

setools/policyrep/fscontext.py

@@ -16,9 +16,9 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
-import symbol
-import context
+from . import qpol
+from . import symbol
+from . import context
 
 
 class FSContext(symbol.PolicySymbol):

setools/policyrep/initsid.py

@@ -16,9 +16,9 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
-import symbol
-import context
+from . import qpol
+from . import symbol
+from . import context
 
 
 class InitialSID(symbol.PolicySymbol):

setools/policyrep/mls.py

@@ -19,8 +19,8 @@
 import itertools
 import string
 
-import qpol
-import symbol
+from . import qpol
+from . import symbol
 
 
 class MLSDisabled(symbol.InvalidSymbol):

setools/policyrep/mlsrule.py

@@ -16,12 +16,12 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
-import rule
-import typeattr
-import mls
-import objclass
-import boolcond
+from . import qpol
+from . import rule
+from . import typeattr
+from . import mls
+from . import objclass
+from . import boolcond
 
 
 class MLSRule(rule.PolicyRule):

setools/policyrep/netcontext.py

@@ -18,9 +18,9 @@
 #
 import socket
 
-import qpol
-import symbol
-import context
+from . import qpol
+from . import symbol
+from . import context
 
 
 class NetContext(symbol.PolicySymbol):

setools/policyrep/objclass.py

@@ -16,8 +16,8 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import symbol
-import qpol
+from . import symbol
+from . import qpol
 
 
 class Common(symbol.PolicySymbol):

setools/policyrep/polcap.py

@@ -16,8 +16,8 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
-import symbol
+from . import qpol
+from . import symbol
 
 
 class PolicyCapability(symbol.PolicySymbol):

setools/policyrep/rbacrule.py

@@ -16,11 +16,11 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
-import rule
-import role
-import typeattr
-import objclass
+from . import qpol
+from . import rule
+from . import role
+from . import typeattr
+from . import objclass
 
 
 class RBACRule(rule.PolicyRule):

setools/policyrep/role.py

@@ -17,9 +17,10 @@
 # <http://www.gnu.org/licenses/>.
 #
 import string
-import qpol
-import symbol
-import typeattr
+
+from . import qpol
+from . import symbol
+from . import typeattr
 
 
 class Role(symbol.PolicySymbol):

setools/policyrep/rule.py

@@ -16,8 +16,8 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
-import symbol
+from . import qpol
+from . import symbol
 
 
 class InvalidRuleUse(Exception):

setools/policyrep/symbol.py

@@ -16,7 +16,7 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-import qpol
+from . import qpol
 
 
 class InvalidSymbol(Exception):

setools/policyrep/terule.py

@@ -18,12 +18,12 @@
 #
 import string
 
-import qpol
-import symbol
-import rule
-import typeattr
-import objclass
-import boolcond
+from . import qpol
+from . import symbol
+from . import rule
+from . import typeattr
+from . import objclass
+from . import boolcond
 
 
 class TERuleNoFilename(Exception):

setools/policyrep/typeattr.py

@@ -18,8 +18,8 @@
 #
 import string
 
-import qpol
-import symbol
+from . import qpol
+from . import symbol
 
 
 class TypeAttr(symbol.PolicySymbol):

setools/policyrep/user.py

@@ -19,10 +19,10 @@
 
 import string
 
-import qpol
-import role
-import mls
-import symbol
+from . import qpol
+from . import role
+from . import mls
+from . import symbol
 
 
 class User(symbol.PolicySymbol):

setools/rbacrulequery.py

@@ -16,8 +16,8 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-from policyrep.rule import InvalidRuleUse
-import rulequery
+from .policyrep.rule import InvalidRuleUse
+from . import rulequery
 
 
 class RBACRuleQuery(rulequery.RuleQuery):

setools/rolequery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import compquery
+from . import compquery
 
 
 class RoleQuery(compquery.ComponentQuery):

setools/rulequery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-from query import PolicyQuery
+from .query import PolicyQuery
 
 
 class RuleQuery(PolicyQuery):

setools/terulequery.py

@@ -16,8 +16,8 @@
 # License along with SETools.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-from policyrep.rule import InvalidRuleUse
-import rulequery
+from .policyrep.rule import InvalidRuleUse
+from . import rulequery
 
 
 class TERuleQuery(rulequery.RuleQuery):

setools/typequery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import compquery
+from . import compquery
 
 
 class TypeQuery(compquery.ComponentQuery):

setools/userquery.py

@@ -18,7 +18,7 @@
 #
 import re
 
-import compquery
+from . import compquery
 
 
 class UserQuery(compquery.ComponentQuery):

tests/__init__.py

@@ -15,16 +15,16 @@
 # You should have received a copy of the GNU General Public License
 # along with SETools.  If not, see <http://www.gnu.org/licenses/>.
 #
-import boolquery
-import commonquery
-import dta
-import initsidquery
-import objclassquery
-import polcapquery
-import permissivequery
-import infoflow
-import terulequery
-import rbacrulequery
-import typequery
-import rolequery
-import userquery
+from . import boolquery
+from . import commonquery
+from . import dta
+from . import initsidquery
+from . import objclassquery
+from . import polcapquery
+from . import permissivequery
+from . import infoflow
+from . import terulequery
+from . import rbacrulequery
+from . import typequery
+from . import rolequery
+from . import userquery