summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasey Dahlin <cdahlin@redhat.com>2008-12-21 22:06:28 -0500
committerCasey Dahlin <cdahlin@redhat.com>2008-12-21 22:06:28 -0500
commit8ac09aca27194cf06747a73052e89750fafef300 (patch)
treeb4d7d4ee90c49a41cc398db91b5e37e1b9cf05c9
parent24781fbc3ad4640b360e92561948f412fbb7ef3e (diff)
downloadupstate-8ac09aca27194cf06747a73052e89750fafef300.tar.gz
upstate-8ac09aca27194cf06747a73052e89750fafef300.tar.xz
upstate-8ac09aca27194cf06747a73052e89750fafef300.zip
Remove unnecessary methods
-rw-r--r--state.py16
1 files changed, 1 insertions, 15 deletions
diff --git a/state.py b/state.py
index 594b32a..f80b557 100644
--- a/state.py
+++ b/state.py
@@ -61,17 +61,6 @@ class Category:
retval.append((key, self.args[key]))
return tuple(retval)
- def filter(self, other):
- if not other.name == self.name:
- raise TypeError, "States must be the same class"
- args = {}
- for key, value in other.args.iteritems():
- if value != None or not self.args.has_key(key):
- args[key] = value
- else:
- args[key] = self.args[key]
- return Category(self.name, **args)
-
def fill(self, info):
args = {}
for key, value in self.args.iteritems():
@@ -81,9 +70,6 @@ class Category:
args[key] = info[key]
return Category(self.name, **args)
- def is_finite(self):
- return not None in self.args.values()
-
class StateMachine:
def __init__(self):
self.holds = {}
@@ -140,7 +126,7 @@ class StateMachine:
retval = []
for (x, y) in self.deps:
if x.equiv(cat):
- retval.append(y.fill(cat.filter(x).args))
+ retval.append(y.fill(cat.intersect(x).args))
return retval
if __name__ == "__main__":