Use relative imports for submodules.

Needed for Python 3.x.
This commit is contained in:
Chris PeBenito 2014-10-25 08:07:11 -04:00
parent bf02670cb6
commit 43e9019193
37 changed files with 126 additions and 122 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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