Merge branch 'nocomponent' into geni-v3

[sfa.git] / sfa / util / policy.py

diff --git a/sfa/util/policy.py b/sfa/util/policy.py
index aa68f43..4340f00 100644 (file)
--- a/sfa/util/policy.py
+++ b/sfa/util/policy.py
@@ -1,22 +1,19 @@
-### $Id$
-### $URL$
-
 import os
 
-from sfa.util.storage import *
+from sfa.util.storage import SimpleStorage
+
 
 class Policy(SimpleStorage):
 
     def __init__(self, api):
         self.api = api
         path = self.api.config.SFA_CONFIG_DIR
-        filename = ".".join([self.api.interface, self.api.hrn, "policy"])    
+        filename = ".".join([self.api.interface, self.api.hrn, "policy"])
         filepath = path + os.sep + filename
         self.policy_file = filepath
         default_policy = {'slice_whitelist': [],
                           'slice_blacklist': [],
                           'node_whitelist': [],
-                          'node_blacklist': []} 
+                          'node_blacklist': []}
         SimpleStorage.__init__(self, self.policy_file, default_policy)
-        self.load()          
- 
+        self.load()